Changeset 5582 in josm for trunk/src

Timestamp:

2012-11-16T23:30:23+01:00 (11 years ago)

Author:

bastiK

Message:

fixed #8196 - preset icon size (patch by kendzi)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

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

@@ -313 +313 @@
         public String short_description;
         public String icon;
+        public String icon_size;
         public String locale_display_value;
         public String locale_short_description;
@@ -341 +342 @@
 
         public ImageIcon getIcon() {
-            return icon == null ? null : loadImageIcon(icon, zipIcons, 24);
+            return icon == null ? null : loadImageIcon(icon, zipIcons, parseInteger(icon_size));
+        }
+
+        private Integer parseInteger(String str) {
+            if (str == null || "".equals(str))
+                return null;
+            try {
+                return Integer.parseInt(str);
+            } catch (Exception e) {
+                //
+            }
+            return null;
         }
 
@@ -761 +773 @@
                     boolean cellHasFocus) {
                 PresetListEntry item = (PresetListEntry) value;
-                
+
                 // Only return cached size, item is not shown
                 if (!list.isShowing() && item.prefferedWidth != -1 && item.prefferedHeight != -1) {
@@ -1276 +1288 @@
         ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
         if (maxSize != null) {
-            imgProv.setMaxSize(24);
+            imgProv.setMaxSize(maxSize);
         }
         return imgProv.get();