Move some more style code into CSS & misc extra CSS work (#255)

* panel: prioritise default.css slightly lower than user-supplied css
panel: remove static-value set-spacing and move to default.css
notifications: add css classes
command-output: add class defining icon-direction to allow css themes to use this

* uncrustify

Author: trigg

data/css/default.css

@@ -20,3 +20,43 @@
     transition: 500ms linear;
     -gtk-icon-transform: scale(1.2);
 }
+
+.wf-panel .battery label,
+.wf-panel .battery:hover label,
+.wf-panel .window-button label,
+.wf-panel .window-button:hover label,
+.wf-panel .tray-button,
+.wf-panel .tray-button:hover,
+.wf-panel .notification button {
+    padding-left: 5px;
+}
+
+.wf-panel .notification .time {
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+.wf-panel .tray .tray-button:first-child,
+.wf-panel .notification button:first-child {
+    padding-left: 0px;
+}
+
+.wf-panel .network label {
+    padding-left: 6px;
+}
+
+.wf-panel .command-output.icon-left label {
+    padding-left: 5px;
+}
+
+.wf-panel .command-output.icon-right label {
+    padding-right: 5px;
+}
+
+.wf-panel .command-output.icon-top label {
+    padding-top: 5px;
+}
+
+.wf-panel .command-output.icon-bottom label {
+    padding-bottom: 5px;
+}

src/panel/panel.cpp

@@ -387,7 +387,13 @@ void WayfirePanelApp::on_css_reload()
     {
         if (p.path().extension() == ext)
         {
-            add_css_file(p.path().string());
+            int priority = GTK_STYLE_PROVIDER_PRIORITY_USER;
+            if (p.path().filename() == "default.css")
+            {
+                priority = GTK_STYLE_PROVIDER_PRIORITY_APPLICATION;
+            }
+
+            add_css_file(p.path().string(), priority);
         }
     }
 
@@ -396,7 +402,7 @@ void WayfirePanelApp::on_css_reload()
     std::string custom_css = custom_css_config;
     if (custom_css != "")
     {
-        add_css_file(custom_css);
+        add_css_file(custom_css, GTK_STYLE_PROVIDER_PRIORITY_USER);
     }
 }
 
@@ -412,7 +418,7 @@ void WayfirePanelApp::clear_css_rules()
     css_rules.clear();
 }
 
-void WayfirePanelApp::add_css_file(std::string file)
+void WayfirePanelApp::add_css_file(std::string file, int priority)
 {
     auto screen = Gdk::Screen::get_default();
     auto style_context = Gtk::StyleContext::create();
@@ -422,7 +428,7 @@ void WayfirePanelApp::add_css_file(std::string file)
         if (css_provider)
         {
             style_context->add_provider_for_screen(
-                screen, css_provider, GTK_STYLE_PROVIDER_PRIORITY_USER);
+                screen, css_provider, priority);
             css_rules.push_back(css_provider);
         }
     }

src/panel/panel.hpp

@@ -42,7 +42,7 @@ class WayfirePanelApp : public WayfireShellApp
     WayfirePanelApp(int argc, char **argv);
 
     void clear_css_rules();
-    void add_css_file(std::string file);
+    void add_css_file(std::string file, int priority);
 
     class impl;
     std::vector<Glib::RefPtr<Gtk::CssProvider>> css_rules;

src/panel/widgets/battery.cpp

@@ -246,7 +246,6 @@ void WayfireBatteryInfo::init(Gtk::HBox *container)
 
     container->pack_start(button, Gtk::PACK_SHRINK);
     button_box.add(label);
-    button_box.set_spacing(5);
 
     button.add(button_box);
     button.property_scale_factor().signal_changed()

src/panel/widgets/command-output.cpp

@@ -54,6 +54,7 @@ WfCommandOutputButtons::CommandOutput::CommandOutput(const std::string & name,
     }
 
     get_style_context()->add_class("command-output");
+    get_style_context()->add_class("icon-" + icon_position);
 
     main_label.set_ellipsize(Pango::ELLIPSIZE_END);
     main_label.set_max_width_chars(max_chars_opt);
@@ -67,8 +68,6 @@ WfCommandOutputButtons::CommandOutput::CommandOutput(const std::string & name,
         main_label.set_max_width_chars(max_chars_opt);
     });
 
-    box.set_spacing(5);
-
     box.set_orientation(
         icon_position == "bottom" ||
         icon_position ==

src/panel/widgets/network.cpp

@@ -413,7 +413,6 @@ void WayfireNetworkInfo::init(Gtk::HBox *container)
     button_content.set_valign(Gtk::ALIGN_CENTER);
     button_content.pack_start(icon, Gtk::PACK_SHRINK);
     button_content.pack_start(status, Gtk::PACK_SHRINK);
-    button_content.set_spacing(6);
 
     icon.set_valign(Gtk::ALIGN_CENTER);
     icon.property_scale_factor().signal_changed().connect(

src/panel/widgets/notifications/single-notification.cpp

@@ -61,15 +61,22 @@ WfSingleNotification::WfSingleNotification(const Notification & notification)
         app_icon.set_from_icon_name("dialog-information", Gtk::ICON_SIZE_LARGE_TOOLBAR);
     }
 
+    get_style_context()->add_class("notification");
+
+    app_icon.get_style_context()->add_class("app-icon");
+
+    top_bar.get_style_context()->add_class("top-bar");
     top_bar.pack_start(app_icon, false, true);
 
     app_name.set_label(notification.app_name);
     app_name.set_halign(Gtk::ALIGN_START);
     app_name.set_ellipsize(Pango::ELLIPSIZE_END);
+    app_name.get_style_context()->add_class("app-name");
     top_bar.pack_start(app_name);
 
     time_label.set_sensitive(false);
     time_label.set_label(format_recv_time(notification.additional_info.recv_time));
+    time_label.get_style_context()->add_class("time");
     time_label_update = Glib::signal_timeout().connect(
         [=]
     {
@@ -83,10 +90,10 @@ WfSingleNotification::WfSingleNotification(const Notification & notification)
     close_image.set_from_icon_name("window-close", Gtk::ICON_SIZE_LARGE_TOOLBAR);
     close_button.add(close_image);
     close_button.get_style_context()->add_class("flat");
+    close_button.get_style_context()->add_class("close");
     close_button.signal_clicked().connect(
         [=] { Daemon::Instance()->closeNotification(notification.id, Daemon::CloseReason::Dismissed); });
     top_bar.pack_start(close_button, false, true);
-    top_bar.set_spacing(5);
 
     child.add(top_bar);
 
@@ -104,6 +111,7 @@ WfSingleNotification::WfSingleNotification(const Notification & notification)
         }
     }
 
+    content.get_style_context()->add_class("notification-contents");
     content.pack_end(image);
 
     text.set_halign(Gtk::ALIGN_START);
@@ -122,6 +130,8 @@ WfSingleNotification::WfSingleNotification(const Notification & notification)
 
     child.add(content);
 
+    actions.get_style_context()->add_class("actions");
+
     if (!notification.actions.empty())
     {
         for (uint i = 0; i + 1 < notification.actions.size(); ++++ i)
@@ -150,7 +160,6 @@ WfSingleNotification::WfSingleNotification(const Notification & notification)
 
         if (!actions.get_children().empty())
         {
-            actions.set_spacing(5);
             actions.set_homogeneous();
             child.add(actions);
         }

src/panel/widgets/tray/tray.cpp

@@ -3,7 +3,6 @@
 void WayfireStatusNotifier::init(Gtk::HBox *container)
 {
     icons_hbox.get_style_context()->add_class("tray");
-    icons_hbox.set_spacing(5);
     container->add(icons_hbox);
 }
 

src/panel/widgets/window-list/toplevel.cpp

@@ -61,7 +61,6 @@ class WayfireToplevel::impl
         button_contents.add(image);
         button_contents.add(label);
         button_contents.set_halign(Gtk::ALIGN_START);
-        button_contents.set_spacing(5);
         button.add(button_contents);
         button.set_tooltip_text("none");