From 02864fd1abb1d75feb90453cc49d291610d76691 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Tue, 18 Jun 2019 04:45:20 +0200 Subject: Fix a icon bug --- .../symbolic/actions/dialog-align-and-distribute-symbolic.svg | 2 +- src/inkscape.cpp | 4 ++-- src/ui/icon-loader.cpp | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/share/icons/nextgen/symbolic/actions/dialog-align-and-distribute-symbolic.svg b/share/icons/nextgen/symbolic/actions/dialog-align-and-distribute-symbolic.svg index efba1a044..836a13c7e 100644 --- a/share/icons/nextgen/symbolic/actions/dialog-align-and-distribute-symbolic.svg +++ b/share/icons/nextgen/symbolic/actions/dialog-align-and-distribute-symbolic.svg @@ -6,7 +6,7 @@ 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 #include #include #include @@ -80,7 +79,9 @@ Glib::RefPtr 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 stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context(); _icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic); -- cgit v1.2.3