Merge branch 'master' into fix/master/fix-folder-icons

This commit is contained in:
NotMyFault committed 2022-02-19 13:13:47 +01:00
commit b4fa965a97
2 files changed
+7 -1

No files matched your search

@@ -221,7 +221,11 @@ public class Icon {
if (string == null) {
return null;
}
return "icon-" + toNormalizedIconName(string);
String iconName = toNormalizedIconName(string);
if (iconName.startsWith("icon-")) {
return iconName;
}
return "icon-" + iconName;
}
/**
@@ -520,6 +520,7 @@ public class IconSet {
images.add("video");
images.add("warning");
images.add("document-properties");
images.add("help");
for (Map.Entry<String, String> size : sizes.entrySet()) {
for (String image : images) {
@@ -549,6 +550,7 @@ public class IconSet {
translations.put("icon-gear2", "symbol-settings");
translations.put("icon-plugin", "symbol-plugins");
translations.put("icon-up", "symbol-arrow-up");
translations.put("icon-help", "symbol-help-circle");
return translations.getOrDefault(tangoIcon, null);
}