diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape.cpp | 4 | ||||
| -rw-r--r-- | src/ui/icon-loader.cpp | 41 |
2 files changed, 19 insertions, 26 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 3c58b1972..b254445d9 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -593,9 +593,7 @@ void Application::add_gtk_css() } Glib::ustring css_str = ""; if (prefs->getBool("/theme/symbolicIcons", false)) { - if (!prefs->getBool("/theme/symbolicDefaultColors", true)) { - css_str = get_symbolic_colors(); - } + css_str = get_symbolic_colors(); } try { colorizeprovider->load_from_data(css_str); diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp index 68d3b6beb..32c7d3bc5 100644 --- a/src/ui/icon-loader.cpp +++ b/src/ui/icon-loader.cpp @@ -67,29 +67,24 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) if (iconinfo && SP_ACTIVE_DESKTOP->getToplevel()) { bool was_symbolic = false; Glib::ustring css_str = ""; - if (!prefs->getBool("/theme/symbolicDefaultColors", true)) { - Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); - guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff); - guint32 colorsetsuccess = - prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff); - guint32 colorsetwarning = - prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff); - guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff); - gchar colornamed[64]; - gchar colornamedsuccess[64]; - gchar colornamedwarning[64]; - gchar colornamederror[64]; - sp_svg_write_color(colornamed, sizeof(colornamed), colorsetbase); - sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess); - sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning); - 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); - } + Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); + guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff); + guint32 colorsetsuccess = + prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff); + guint32 colorsetwarning = + prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff); + guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff); + gchar colornamed[64]; + gchar colornamedsuccess[64]; + gchar colornamedwarning[64]; + gchar colornamederror[64]; + sp_svg_write_color(colornamed, sizeof(colornamed), colorsetbase); + sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess); + sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning); + 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 { Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); _icon_pixbuf = iconinfo.load_icon(); |