summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-11-06 22:53:24 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-11-06 22:53:24 +0000
commit8a721ff1c063c9410d6b71604ceef43a6df4bc11 (patch)
tree90c58e7b93f4bb19716de29e3108070ad40ed118 /src
parentFix icon loader to allow inverse color in symbolic icons. Also added searchin... (diff)
downloadinkscape-8a721ff1c063c9410d6b71604ceef43a6df4bc11.tar.gz
inkscape-8a721ff1c063c9410d6b71604ceef43a6df4bc11.zip
Allow symbolic icons in default icon theme
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 9b0190d13..ce77bf0a5 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -603,6 +603,7 @@ void InkscapePreferences::symbolicThemeCheck()
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
auto folders = get_foldernames(ICONS, { "application" });
bool symbolic = false;
+ bool default_icon_theme = true;
for (auto &folder : folders) {
auto path = folder;
const size_t last_slash_idx = folder.find_last_of("\\/");
@@ -615,6 +616,7 @@ void InkscapePreferences::symbolicThemeCheck()
#else
path += "/symbolic/actions";
#endif
+ default_icon_theme = false;
std::vector<Glib::ustring> symbolic_icons = get_filenames(path, { ".svg" }, {});
if (symbolic_icons.size() > 0) {
symbolic = true;
@@ -622,6 +624,9 @@ void InkscapePreferences::symbolicThemeCheck()
}
}
}
+ if (default_icon_theme) {
+ symbolic = true;
+ }
if (_symbolic_icons.get_parent()) {
if (!symbolic) {
_symbolic_icons.set_active(false);