From a3d8f54ac8d60b40bc6d58eb559d461eeaf1552f Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Mon, 6 Apr 2020 00:54:07 +0200 Subject: [PATCH] Fix icons issues --- src/inkscape.cpp | 7 ++++++- src/ui/dialog/inkscape-preferences.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 38513d37ab..9423bf7eb1 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -398,7 +398,12 @@ void Application::add_gtk_css() if (themeiconname != "") { g_object_set(settings, "gtk-icon-theme-name", themeiconname.c_str(), NULL); } else { - prefs->setString("/theme/iconTheme", Glib::ustring(gtkIconThemeName)); + if (Glib::ustring(gtkIconThemeName) == "Adwaita") { + g_object_set(settings, "gtk-icon-theme-name", "hicolor", NULL); + prefs->setString("/theme/iconTheme", "hicolor"); + } else { + prefs->setString("/theme/iconTheme", Glib::ustring(gtkIconThemeName)); + } } } diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 7ae7a78bb5..20550a3f8a 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1222,10 +1222,10 @@ void InkscapePreferences::initPageUI() std::sort(values.begin(), values.end()); labels.erase(unique(labels.begin(), labels.end()), labels.end()); values.erase(unique(values.begin(), values.end()), values.end()); - values.push_back(default_icon_theme); if (default_icon_theme == "Adwaita") { default_icon_theme = "hicolor"; } + values.emplace_back(default_icon_theme); Glib::ustring default_icon_label = _("Use system icons"); default_icon_label += " (" + default_icon_theme + ")"; labels.emplace_back(default_icon_label); -- GitLab