Changeset 7687 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/ToolbarPreferences.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (3 diffs)

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;
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -11 +11 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -143 +144 @@
      * Called from the XML parser to set the icon.
      * This task is performed in the background in order to speedup startup.
-     *
-     * FIXME for Java 1.6 - use 24x24 icons for LARGE_ICON_KEY (button bar)
-     * and the 16x16 icons for SMALL_ICON.
      */
     public void setIcon(final String iconName) {
+        File arch = TaggingPresetReader.getZipIcons();
+        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
         ImageProvider imgProv = new ImageProvider(iconName);
-        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
         imgProv.setDirs(s);
         imgProv.setId("presets");
-        imgProv.setArchive(TaggingPresetReader.getZipIcons());
+        imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.setMaxWidth(16).setMaxHeight(16);
+        imgProv.setSize(ImageProvider.ImageSizes.SMALLICON);
         imgProv.getInBackground(new ImageProvider.ImageCallback() {
             @Override
@@ -167 +166 @@
                 } else {
                     Main.warn("Could not get presets icon " + iconName);
+                }
+            }
+        });
+        imgProv = new ImageProvider(iconName);
+        imgProv.setDirs(s);
+        imgProv.setId("presets");
+        imgProv.setArchive(arch);
+        imgProv.setOptional(true);
+        imgProv.setSize(ImageProvider.ImageSizes.LARGEICON);
+        imgProv.getInBackground(new ImageProvider.ImageCallback() {
+            @Override
+            public void finished(final ImageIcon result) {
+                if (result != null) {
+                    GuiHelper.runInEDT(new Runnable() {
+                        @Override
+                        public void run() {
+                            putValue(Action.LARGE_ICON_KEY, result);
+                        }
+                    });
                 }
             }