diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-21 21:56:50 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-21 21:56:50 +0000 |
| commit | 58c87a9e1d686d1826df7bd29ca27794d859b3dd (patch) | |
| tree | c4d182115470af5e8613af533f2f3fcf3558ca32 /src | |
| parent | Working on themes (diff) | |
| download | inkscape-58c87a9e1d686d1826df7bd29ca27794d859b3dd.tar.gz inkscape-58c87a9e1d686d1826df7bd29ca27794d859b3dd.zip | |
Fixing some icons dont redraw
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 59f503bf7..13283b03d 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -395,9 +395,7 @@ Application::add_style_sheet() Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // symbolic auto provider = Gtk::CssProvider::create(); - Glib::ustring css_str = "*{-gtk-icon-theme:\""; - css_str += prefs->getString("/theme/iconTheme"); - css_str += "\";}"; + Glib::ustring css_str = ""; if (prefs->getBool("/theme/symbolicIcons", false)) { gchar colornamed[64]; sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index f31b443fb..7e6e516ae 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -822,16 +822,12 @@ void InkscapePreferences::initPageUI() { filename.erase(0, last_slash_idx + 1); } - - // Remove extension if present. - const size_t period_idx = filename.rfind('.'); - if (std::string::npos != period_idx) - { - filename.erase(period_idx); - } + labels.push_back(filename); values.push_back(filename); } + std::sort(labels.begin(), labels.end()); + std::sort(values.begin(), values.end()); labels.erase(unique(labels.begin(), labels.end()), labels.end()); values.erase(unique(values.begin(), values.end()), values.end()); _icon_theme.init("/theme/iconTheme", labels, values, "hicolor"); |
