Changeset 5543 in josm for trunk/src/org

Timestamp:

2012-10-30T15:40:23+01:00 (12 years ago)

Author:

bastiK

Message:

fixed #8162 - Handling of SVG in ICONS for <combo> <list_entry> </combo>

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/TaggingPreset.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (1 diff)

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

@@ -341 +341 @@
 
         public ImageIcon getIcon() {
-            return icon == null ? null : loadImageIcon(icon, zipIcons);
+            return icon == null ? null : loadImageIcon(icon, zipIcons, 24);
         }
 
@@ -1264 +1264 @@
     }
 
-    protected static ImageIcon loadImageIcon(String iconName, File zipIcons) {
+    protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
         final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-        return new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
+        ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
+        if (maxSize != null) {
+            imgProv.setMaxSize(24);
+        }
+        return imgProv.get();
     }
 

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -197 +197 @@
         this.maxHeight = maxSize.height;
         return this;
+    }
+    
+    /**
+     * Convenience method, see {@link #setMaxSize(Dimension)}.
+     */
+    public ImageProvider setMaxSize(int maxSize) {
+        return this.setMaxSize(new Dimension(maxSize, maxSize));
     }