Changeset 7687 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

Timestamp:

2014-11-01T23:00:42+01:00 (9 years ago)

Author:

stoecker

Message:

see #10684, see #10688 fix icon scaling a bit

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -124 +124 @@
 
         public Icon getDisplayIcon() {
-            return ico != null ? ico : (Icon) action.getValue(Action.SMALL_ICON);
+            if(ico != null)
+                return ico;
+            Object o = action.getValue(Action.LARGE_ICON_KEY);
+            if(o == null)
+                o = action.getValue(Action.SMALL_ICON);
+            return (Icon) o;
         }