Improving styling

4 files changed, 48 insertions, 21 deletions

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 11e446ca9..23179ee12 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -383,12 +383,12 @@ Application::add_gtk_css()
                      prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
         prefs->setString("/theme/defaultTheme", Glib::ustring(gtkThemeName));
         prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
-        if (prefs->getString("/theme/gtkTheme") != "") {
-            g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL);
+        Glib::ustring gtkthemename = prefs->getString("/theme/gtkTheme");
+        if (gtkthemename != "") {
+            g_object_set(settings, "gtk-theme-name",  gtkthemename.c_str(), NULL);
         } else {
             prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
         }
-
         Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
         if (themeiconname != "") {
             g_object_set(settings, "gtk-icon-theme-name", themeiconname.c_str(), NULL);
@@ -397,7 +397,7 @@ Application::add_gtk_css()
         }
         g_object_get(settings, "gtk-font-name", &gtk_font_name, NULL);
     }
-    
+
     auto provider = Gtk::CssProvider::create();
     Glib::ustring style = get_filename(UIS, "style.css");
     if (!style.empty()) {
@@ -410,7 +410,9 @@ Application::add_gtk_css()
       }
       Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
-    colorizeprovider = Gtk::CssProvider::create();
+    if (!colorizeprovider) {
+        colorizeprovider = Gtk::CssProvider::create();
+    }
     Glib::ustring css_str = "";
     if (prefs->getBool("/theme/symbolicIcons", false)) {
         if (!prefs->getBool("/theme/symbolicIconsDefaultColor", true)) {
@@ -430,7 +432,7 @@ Application::add_gtk_css()
             // Use in case the special widgets have inverse theme background and symbolic
             int colorset_inverse = colorset ^ 0xffffff00;
             sp_svg_write_color(colornamed_inverse, sizeof(colornamed_inverse), colorset_inverse);
-            
+
             css_str += "*{-gtk-icon-palette: success ";
             css_str += colornamedsuccess;
             css_str += ", warning ";
@@ -458,6 +460,7 @@ Application::add_gtk_css()
     }
     Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     if (!strncmp(gtk_font_name, "Cantarell", 9)) {
+        provider = Gtk::CssProvider::create();
         css_str = "#monoStrokeWidth,";
         css_str += "#fillEmptySpace,";
         css_str += "#SelectStatus,";
@@ -469,10 +472,11 @@ Application::add_gtk_css()
         try {
             provider->load_from_data(css_str);
         } catch (const Gtk::CssProviderError &ex) {
-            g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str());
+            g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(),
+                       ex.what().c_str());
         }
         Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
+     }
 }
 
 /* \brief Constructor for the application.
diff --git a/src/inkscape.h b/src/inkscape.h
index 86649e0cb..815da0f1d 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -14,14 +14,14 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include <map>
-#include <vector>
-#include <glib.h>
-#include <glib-object.h>
-#include <sigc++/signal.h>
 #include "layer-model.h"
-#include <gtkmm/cssprovider.h>
 #include "selection.h"
+#include <glib-object.h>
+#include <glib.h>
+#include <gtkmm/cssprovider.h>
+#include <map>
+#include <sigc++/signal.h>
+#include <vector>
 
 class SPDesktop;
 class SPDocument;
@@ -109,7 +109,7 @@ public:
     Inkscape::UI::Tools::ToolBase * active_event_context();
     SPDocument * active_document();
     SPDesktop * active_desktop();
-    Glib::RefPtr< Gtk::CssProvider > colorizeprovider;
+    Glib::RefPtr<Gtk::CssProvider> colorizeprovider;
     // Use this function to get selection model etc for a document
     Inkscape::ActionContext action_context_for_document(SPDocument *doc);
     Inkscape::ActionContext active_action_context();
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f3bba55c3..6151eeef0 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -630,7 +630,9 @@ void InkscapePreferences::symbolicThemeCheck()
 
 void InkscapePreferences::symbolicDefaultColor(){
     auto const screen = Gdk::Screen::get_default();
-    Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
+    if (INKSCAPE.colorizeprovider) {
+        Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
+    }
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setBool("/theme/symbolicIconsDefaultColor", true);
 }
@@ -638,7 +640,9 @@ void InkscapePreferences::symbolicDefaultColor(){
 void InkscapePreferences::symbolicStyling()
 {
     auto const screen = Gdk::Screen::get_default();
-    Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
+    if (INKSCAPE.colorizeprovider) {
+        Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
+    }
     using namespace Inkscape::IO::Resource;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setBool("/theme/symbolicIconsDefaultColor", false);
@@ -695,7 +699,8 @@ void InkscapePreferences::symbolicStyling()
     } catch (const Gtk::CssProviderError &ex) {
         g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str());
     }
-    Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider,
+                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 void InkscapePreferences::themeChange()
diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
index f69d3148d..6853d7e68 100644
--- a/src/ui/icon-loader.cpp
+++ b/src/ui/icon-loader.cpp
@@ -13,6 +13,7 @@
 
 #include "icon-loader.h"
 #include "inkscape.h"
+#include "svg/svg-color.h"
 #include "widgets/toolbox.h"
 #include <gtkmm/iconinfo.h>
 #include <gdkmm/display.h>
@@ -64,9 +65,26 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
         Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE);
         if (iconinfo && SP_ACTIVE_DESKTOP->getToplevel()) {
             bool was_symbolic = false;
-            Glib::RefPtr< Gtk::StyleContext > stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context();
-            stylecontext->add_provider(INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-            _icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic);
+            Glib::ustring css_str = "";
+            if (!prefs->getBool("/theme/symbolicIconsDefaultColor", true)) {
+                gchar colornamed[64];
+                gchar colornamedsuccess[64];
+                gchar colornamedwarning[64];
+                gchar colornamederror[64];
+                gchar colornamed_inverse[64];
+                int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff);
+                sp_svg_write_color(colornamed, sizeof(colornamed), colorset);
+                int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff);
+                sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
+                int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff);
+                sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
+                int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff);
+                sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
+                _icon_pixbuf = iconinfo.load_symbolic(Gdk::RGBA(colornamed), Gdk::RGBA(colornamedsuccess), Gdk::RGBA(colornamedwarning), Gdk::RGBA(colornamederror), was_symbolic);
+            } else {
+                Glib::RefPtr<Gtk::StyleContext> stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context();
+                _icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic);
+            }
         } else {
             Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
             _icon_pixbuf = iconinfo.load_icon();