Add cssPriority to config (#176)

man/swaync.5.scd

@@ -27,6 +27,13 @@ config file to be able to detect config errors
 	values: background, bottom, top, overlay ++
 	description: Layer of control center window relative to normal windows. background is below all windows, overlay is above all windows.
 
+*cssPriority* ++
+	type: string ++
+	default: application ++
+	values: application, user ++
+	description: Which GTK priority to use when loading the default and user ++
+		CSS files. Pick "user" to override *XDG_CONFIG_HOME/gtk-3.0/gtk.css*
+
 *control-center-margin-top* ++
 	type: integer ++
 	default: 0 ++

src/config.json.in

@@ -3,6 +3,7 @@
   "positionX": "right",
   "positionY": "top",
   "layer": "top",
+  "cssPriority": "application",
   "control-center-margin-top": 0,
   "control-center-margin-bottom": 0,
   "control-center-margin-right": 0,

src/configModel/configModel.vala

@@ -61,6 +61,20 @@ namespace SwayNotificationCenter {
         }
     }
 
+    public enum CssPriority {
+        APPLICATION, USER;
+
+        public int get_priority () {
+            switch (this) {
+                case APPLICATION:
+                default:
+                    return Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION;
+                case USER:
+                    return Gtk.STYLE_PROVIDER_PRIORITY_USER;
+            }
+        }
+    }
+
     public class Category : Object {
         public string ? sound { get; set; default = null; }
         public string ? icon { get; set; default = null; }
@@ -308,6 +322,11 @@ namespace SwayNotificationCenter {
             get; set; default = Layer.TOP;
         }
 
+        /** The CSS loading priority */
+        public CssPriority cssPriority { // vala-lint=naming-convention
+            get; set; default = CssPriority.APPLICATION;
+        }
+
         /** The timeout for notifications with NORMAL priority */
         private const int TIMEOUT_DEFAULT = 10;
         private int _timeout = TIMEOUT_DEFAULT;

src/configSchema.json

@@ -20,6 +20,12 @@
       "default": "top",
       "enum": ["background", "bottom", "top", "overlay"]
     },
+    "cssPriority": {
+      "type": "string",
+      "description": "Which GTK priority to use when loading the default and user CSS files. Pick \"user\" to override XDG_CONFIG_HOME/gtk-3.0/gtk.css",
+      "default": "application",
+      "enum": ["application", "user"]
+    },
     "positionY": {
       "type": "string",
       "description": "Vertical position of control center and notification window",

src/functions.vala

@@ -70,6 +70,8 @@ namespace SwayNotificationCenter {
          * with default GTK style properties
          */
         public static bool load_css (string ? style_path) {
+            int css_priority = ConfigModel.instance.cssPriority.get_priority ();
+
             try {
                 // Load packaged CSS as backup
                 string system_css = get_style_path (null, true);
@@ -77,18 +79,23 @@ namespace SwayNotificationCenter {
                 Gtk.StyleContext.add_provider_for_screen (
                     Gdk.Screen.get_default (),
                     system_css_provider,
-                    Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+                    css_priority);
+            } catch (Error e) {
+                print ("Load packaged CSS Error: %s\n", e.message);
+                return false;
+            }
 
+            try {
                 // Load user CSS
                 string user_css = get_style_path (style_path);
                 user_css_provider.load_from_path (user_css);
                 Gtk.StyleContext.add_provider_for_screen (
                     Gdk.Screen.get_default (),
                     user_css_provider,
-                    Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+                    css_priority);
                 return true;
             } catch (Error e) {
-                print ("Load CSS Error: %s\n", e.message);
+                print ("Load user CSS Error: %s\n", e.message);
                 return false;
             }
         }

src/main.vala

@@ -37,8 +37,8 @@ namespace SwayNotificationCenter {
             }
         }
 
-        Functions.load_css (style_path);
         ConfigModel.init (config_path);
+        Functions.load_css (style_path);
 
         swaync_daemon = new SwayncDaemon ();
         Bus.own_name (BusType.SESSION, "org.erikreider.swaync.cc",