diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-07-09 10:57:35 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-07-09 10:57:35 +0000 |
| commit | 0f9c41baab61b7b8beb9e11509f10b4017bc0337 (patch) | |
| tree | f8667f636664e49203b97db927f034288a0cffc0 /src/ui/icon-loader.cpp | |
| parent | improve icons theming to real status (diff) | |
| download | inkscape-0f9c41baab61b7b8beb9e11509f10b4017bc0337.tar.gz inkscape-0f9c41baab61b7b8beb9e11509f10b4017bc0337.zip | |
Fix a issue on defaulñt colors for custom theme, remove the not needed folder scallable and add a WIP icons for align and distribute
Diffstat (limited to 'src/ui/icon-loader.cpp')
| -rw-r--r-- | src/ui/icon-loader.cpp | 41 |
1 files changed, 18 insertions, 23 deletions
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(); |