From d48446b517a46e94ab44cce2f8ace5250cd7025d Mon Sep 17 00:00:00 2001 From: Jabiertxo Arraiza Cenoz Date: Fri, 27 Jul 2018 18:12:27 +0200 Subject: Working on icons --- src/helper/icon-loader.cpp | 5 ++++- src/io/resource.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 362661e84..1c21a492d 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -41,6 +41,8 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) if (icon_name == "gtk-preferences") { icon_name = "preferences-system"; } + iconTheme->append_search_path(get_path_ustring(SYSTEM, ICONS) + "hicolor/symbolic"); + iconTheme->append_search_path(get_path_ustring(USER, ICONS)+ "hicolor/symbolic"); sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); Gdk::RGBA color; color.set(colornamed); @@ -48,11 +50,12 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); if (bool(iconinfo)) { // TODO: view if we need parametrice other colors + bool was_symbolic = false; _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); } else { - _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + _icon_pixbuf = iconTheme->load_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); } } else { diff --git a/src/io/resource.cpp b/src/io/resource.cpp index d90f329d9..72cf3c2f9 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -102,7 +102,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case PATTERNS: name = "patterns"; break; case SYMBOLS: name = "symbols"; break; case TEMPLATES: name = "templates"; break; - case THEMES: name = "icons"; break; + case THEMES: name = "themes"; break; case UIS: name = "ui"; break; case PIXMAPS: name = "pixmaps"; break; case DATADIR: name = ""; break; -- cgit v1.2.3