Changeset 10358 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2016-06-12T12:00:38+02:00 (7 years ago)

Author:

stoecker

Message:

see #9995 - improve handling for HIDPI screens, patch by strump (modified by me)

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Image;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
@@ -77 +75 @@
     public String iconPath;
     /** The plugin icon. */
-    public ImageIcon icon;
+    private ImageProvider icon;
     /** Plugin can be loaded at any time and not just at start. */
     public boolean canloadatruntime;
@@ -84 +82 @@
     /** All manifest attributes. */
     public final Map<String, String> attr = new TreeMap<>();
-
-    private static final ImageIcon emptyIcon = new ImageIcon(new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB));
+    /** Empty icon for these plugins which have none */
+    private static final ImageIcon emptyIcon = ImageProvider.getEmpty(ImageProvider.ImageSizes.LARGEICON);
 
     /**
@@ -244 +242 @@
             if (file != null) {
                 // extract icon from the plugin jar file
-                icon = new ImageProvider(iconPath).setArchive(file).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
+                icon = new ImageProvider(iconPath).setArchive(file).setMaxSize(ImageProvider.ImageSizes.LARGEICON).setOptional(true);
             } else if (iconPath.startsWith("data:")) {
-                icon = new ImageProvider(iconPath).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
+                icon = new ImageProvider(iconPath).setMaxSize(ImageProvider.ImageSizes.LARGEICON).setOptional(true);
             }
         }
@@ -494 +492 @@
 
     /**
-     * Replies the plugin icon, scaled to 24x24 pixels.
-     * @return the plugin icon, scaled to 24x24 pixels.
+     * Replies the plugin icon, scaled to LARGE_ICON size.
+     * @return the plugin icon, scaled to LARGE_ICON size.
      */
     public ImageIcon getScaledIcon() {
-        if (icon == null)
+        ImageIcon img = (icon != null) ? icon.get() : null;
+        if (img == null)
             return emptyIcon;
-        return new ImageIcon(icon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH));
+        return img;
     }