diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-06-18 02:45:20 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-06-18 02:45:20 +0000 |
| commit | 02864fd1abb1d75feb90453cc49d291610d76691 (patch) | |
| tree | 970a55ea4339c1fd55133ae12b35baa067b92af6 /src | |
| parent | Improving styling (diff) | |
| download | inkscape-02864fd1abb1d75feb90453cc49d291610d76691.tar.gz inkscape-02864fd1abb1d75feb90453cc49d291610d76691.zip | |
Fix a icon bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape.cpp | 4 | ||||
| -rw-r--r-- | src/ui/icon-loader.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 23179ee12..7b250f6dd 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -385,7 +385,7 @@ Application::add_gtk_css() prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName)); Glib::ustring gtkthemename = prefs->getString("/theme/gtkTheme"); if (gtkthemename != "") { - g_object_set(settings, "gtk-theme-name", gtkthemename.c_str(), NULL); + g_object_set(settings, "gtk-theme-name", gtkthemename.c_str(), NULL); } else { prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName)); } @@ -476,7 +476,7 @@ Application::add_gtk_css() 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/ui/icon-loader.cpp b/src/ui/icon-loader.cpp index 6853d7e68..2e0e11333 100644 --- a/src/ui/icon-loader.cpp +++ b/src/ui/icon-loader.cpp @@ -15,7 +15,6 @@ #include "inkscape.h" #include "svg/svg-color.h" #include "widgets/toolbox.h" -#include <gtkmm/iconinfo.h> #include <gdkmm/display.h> #include <gdkmm/screen.h> #include <gtkmm/iconinfo.h> @@ -80,7 +79,9 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) 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); + _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); |