Add custom GTK3 themes inside Inkscape

3 files changed, 80 insertions, 32 deletions

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 2164a90a2..71ed178b7 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -541,6 +541,64 @@ Glib::ustring Application::get_symbolic_colors()
 /**
  * \brief Add our CSS style sheets
  */
+void Application::add_inkscape_css() 
+{
+    using namespace Inkscape::IO::Resource;
+    auto const screen = Gdk::Screen::get_default();
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    if (!customcssprovider) {
+        customcssprovider = Gtk::CssProvider::create();
+    } else {
+        Gtk::StyleContext::remove_provider_for_screen(screen, customcssprovider);
+    }
+    Glib::ustring customthemename = prefs->getString("/theme/gtkTheme");
+    if (customthemename.find("inkscapecustom::") != -1) {
+        customthemename = customthemename.substr(16);
+        Glib::ustring style = customthemename + "/gtk-3.0/gtk.css";
+        bool dark = prefs->getBool("/theme/preferDarkTheme", false) || customthemename.find(":dark") != -1;
+        if (dark) {
+            style = customthemename + "/gtk-3.0/gtk-dark.css";
+        }
+        style = get_filename(THEMES, style.c_str());
+        if (!style.empty()) {
+            try {
+                customcssprovider->load_from_path(style);
+            } catch (const Gtk::CssProviderError &ex) {
+                g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
+                        ex.what().c_str());
+            }
+            Gtk::StyleContext::add_provider_for_screen(screen, customcssprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+    }
+    Glib::ustring style = get_filename(UIS, "style.css");
+    if (!style.empty()) {
+        auto provider = Gtk::CssProvider::create();
+        try {
+            provider->load_from_path(style);
+        } catch (const Gtk::CssProviderError &ex) {
+            g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
+                       ex.what().c_str());
+        }
+        Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+    if (!colorizeprovider) {
+        colorizeprovider = Gtk::CssProvider::create();
+    }
+    Glib::ustring css_str = "";
+    if (prefs->getBool("/theme/symbolicIcons", false)) {
+        css_str = get_symbolic_colors();
+    }
+    try {
+        colorizeprovider->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());
+    }
+    Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+/**
+ * \brief Add our CSS style sheets
+ */
 void Application::add_gtk_css()
 {
     using namespace Inkscape::IO::Resource;
@@ -563,6 +621,10 @@ void Application::add_gtk_css()
         prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
         Glib::ustring gtkthemename = prefs->getString("/theme/gtkTheme");
         if (gtkthemename != "") {
+            if (gtkthemename.find("inkscapecustom::") != -1) {
+                //we use adwaita as base of all custom CSS, seems more standar than user default theme than can make unwanted results
+                gtkthemename = "Adwaita"; 
+            }
             g_object_set(settings, "gtk-theme-name", gtkthemename.c_str(), NULL);
         } else {
             prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
@@ -575,33 +637,9 @@ void Application::add_gtk_css()
         }
         g_object_get(settings, "gtk-font-name", &gtk_font_name, NULL);
     }
-
-
-    Glib::ustring style = get_filename(UIS, "style.css");
-    if (!style.empty()) {
-        auto provider = Gtk::CssProvider::create();
-        try {
-            provider->load_from_path(style);
-        } catch (const Gtk::CssProviderError &ex) {
-            g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
-                       ex.what().c_str());
-        }
-        Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
-    if (!colorizeprovider) {
-        colorizeprovider = Gtk::CssProvider::create();
-    }
+    add_inkscape_css();
+    
     Glib::ustring css_str = "";
-    if (prefs->getBool("/theme/symbolicIcons", false)) {
-        css_str = get_symbolic_colors();
-    }
-    try {
-        colorizeprovider->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());
-    }
-    Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
     if (!strncmp(gtk_font_name, "Cantarell", 9)) {
         auto provider = Gtk::CssProvider::create();
         css_str = "#monoStrokeWidth,";
diff --git a/src/inkscape.h b/src/inkscape.h
index 897f9e296..ae5e968fa 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -110,6 +110,7 @@ public:
     SPDocument * active_document();
     SPDesktop * active_desktop();
     Glib::RefPtr<Gtk::CssProvider> colorizeprovider;
+    Glib::RefPtr<Gtk::CssProvider> customcssprovider;
     // Use this function to get selection model etc for a document
     Inkscape::ActionContext action_context_for_document(SPDocument *doc);
     Inkscape::ActionContext active_action_context();
@@ -207,6 +208,7 @@ public:
     }
 
     void add_gtk_css();
+    void add_inkscape_css();
     void add_icon_theme();
 
   private:
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index c6be1e97f..66d8b39ac 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -777,19 +777,26 @@ void InkscapePreferences::themeChange()
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         bool darktheme = prefs->getBool("/theme/preferDarkTheme", false);
         Glib::ustring themename = prefs->getString("/theme/gtkTheme");
-        if (themename.find("inkscapecustom::") != -1) {
-            prefs->setString("/theme/gtkCustomTheme", themename.substr(16));
-            themename = "Adwaita";
-            prefs->setString("/theme/gtkTheme", "Adwaita");
+        Glib::ustring customthemename = prefs->getString("/theme/gtkTheme");
+        if (customthemename.find("inkscapecustom::") != -1) {
+            //we use adwaita as base of all custom CSS, seems more standar than user default theme than can make unwanted results
+            themename = "Adwaita"; 
         }
         Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
         GtkSettings *settings = gtk_settings_get_default();
         g_object_set(settings, "gtk-theme-name", themename.c_str(), NULL);
         g_object_set(settings, "gtk-application-prefer-dark-theme", darktheme, NULL);
+
         gchar *gtkThemeName;
         gboolean gtkApplicationPreferDarkTheme;
-        
         bool dark = darktheme || themename.find(":dark") != -1;
+        if (customthemename.find("inkscapecustom::") != -1) {
+            dark = prefs->getBool("/theme/preferDarkTheme", false) || customthemename.find(":dark") != -1;
+            INKSCAPE.add_inkscape_css();
+        } else if (INKSCAPE.customcssprovider) {
+            auto const screen = Gdk::Screen::get_default();
+            Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.customcssprovider);
+        }
         if (!dark) {
             Glib::RefPtr<Gtk::StyleContext> stylecontext = window->get_style_context();
             Gdk::RGBA rgba;
@@ -2608,7 +2615,8 @@ void InkscapePreferences::initPageSystem()
     _page_system.add_line(true, _("User extensions: "), _sys_user_extension_dir, "",
                           _("Location of the user’s extensions"), true);
 
-    _sys_user_themes_dir.init(g_build_filename(g_get_user_data_dir(), "themes", NULL), _("Open themes folder"));
+    _sys_user_themes_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::THEMES, ""),
+                                 _("Open themes folder"));
     _page_system.add_line(true, _("User themes: "), _sys_user_themes_dir, "", _("Location of the user’s themes"), true);
 
     _sys_user_icons_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::ICONS, ""),