Changeset 10428 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-06-19T18:28:26+02:00 (7 years ago)

Author:

stoecker

Message:

see #9995 - patch mainly by strump - improve HIDPI behaviour

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (10 diffs)
• ImageResource.java (modified) (6 diffs)

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

@@ -272 +272 @@
     /** ordered list of overlay images */
     protected List<ImageOverlay> overlayInfo;
+    /** <code>true</code> if icon must be grayed out */
+    protected boolean isDisabled = false;
 
     private static SVGUniverse svgUniverse;
@@ -351 +353 @@
         this.additionalClassLoaders = image.additionalClassLoaders;
         this.overlayInfo = image.overlayInfo;
+        this.isDisabled = image.isDisabled;
     }
 
@@ -601 +604 @@
 
     /**
+     * Set, if image must be filtered to grayscale so it will look like disabled icon.
+     *
+     * @param disabled true, if image must be grayed out for disabled state
+     * @return the current object, for convenience
+     * @since 10428
+     */
+    public ImageProvider setDisabled(boolean disabled) {
+        this.isDisabled = disabled;
+        return this;
+    }
+
+    /**
      * Execute the image request and scale result.
      * @return the requested image or null if the request failed
@@ -606 +621 @@
     public ImageIcon get() {
         ImageResource ir = getResource();
-        if (ir == null)
+
+        if (ir == null) {
             return null;
+        }
         if (virtualMaxWidth != -1 || virtualMaxHeight != -1)
             return ir.getImageIconBounded(new Dimension(virtualMaxWidth, virtualMaxHeight));
@@ -638 +655 @@
             ir = new ImageResource(ir, overlayInfo);
         }
+        if (isDisabled) {
+            ir.setDisabled(true);
+        }
         return ir;
     }
@@ -718 +738 @@
 
     /**
+     * Load an image from directory with a given file name and size.
+     *
+     * @param subdir subdirectory the image lies in
+     * @param name The icon name (base name with or without '.png' or '.svg' extension)
+     * @param size Target icon size
+     * @return The requested Image.
+     * @throws RuntimeException if the image cannot be located
+     * @since 10428
+     */
+    public static ImageIcon get(String subdir, String name, ImageSizes size) {
+        return new ImageProvider(subdir, name).setSize(size).get();
+    }
+
+    /**
      * Load an empty image with a given size.
      *
@@ -741 +775 @@
     public static ImageIcon getIfAvailable(String subdir, String name) {
         return new ImageProvider(subdir, name).setOptional(true).get();
+    }
+
+    /**
+     * Load an image with a given file name and size.
+     *
+     * @param name The icon name (base name with or without '.png' or '.svg' extension)
+     * @param size Target icon size
+     * @return the requested image or null if the request failed
+     * @see #get(String, String)
+     * @since 10428
+     */
+    public static ImageIcon get(String name, ImageSizes size) {
+        return new ImageProvider(name).setSize(size).get();
     }
 
@@ -776 +823 @@
                 return null;
 
+            String prefix = "";
+            if(isDisabled)
+              prefix = "dis:"+prefix;
             if (name.startsWith("data:")) {
                 String url = name;
-                ImageResource ir = cache.get(url);
+                ImageResource ir = cache.get(prefix+url);
                 if (ir != null) return ir;
                 ir = getIfAvailableDataUrl(url);
                 if (ir != null) {
-                    cache.put(url, ir);
+                    cache.put(prefix+url, ir);
                 }
                 return ir;
@@ -791 +841 @@
             if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(HTTPS_PROTOCOL)) {
                 String url = name;
-                ImageResource ir = cache.get(url);
+                ImageResource ir = cache.get(prefix+url);
                 if (ir != null) return ir;
                 ir = getIfAvailableHttp(url, type);
                 if (ir != null) {
-                    cache.put(url, ir);
+                    cache.put(prefix+url, ir);
                 }
                 return ir;
             } else if (name.startsWith(WIKI_PROTOCOL)) {
-                ImageResource ir = cache.get(name);
+                ImageResource ir = cache.get(prefix+name);
                 if (ir != null) return ir;
                 ir = getIfAvailableWiki(name, type);
                 if (ir != null) {
-                    cache.put(name, ir);
+                    cache.put(prefix+name, ir);
                 }
                 return ir;
@@ -831 +881 @@
 
                     String fullName = subdir + name + ext;
-                    String cacheName = fullName;
+                    String cacheName = prefix + fullName;
                     /* cache separately */
                     if (dirs != null && !dirs.isEmpty()) {

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

@@ -11 +11 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.gui.util.GuiSizesHelper;
@@ -43 +46 @@
      */
     protected List<ImageOverlay> overlayInfo;
+    /**
+     * <code>true</code> if icon must be grayed out
+     */
+    protected boolean isDisabled = false;
+    /**
+     * The base raster image for the final output
+     */
     private Image baseImage;
 
@@ -51 +61 @@
     public ImageResource(Image img) {
         CheckParameterUtil.ensureParameterNotNull(img);
-        baseImage = img;
-        imgCache.put(DEFAULT_DIMENSION, scaleBaseImageIfNeeded(img));
+        baseImage = scaleBaseImageIfNeeded(img);
     }
 
@@ -96 +105 @@
 
     /**
+     * Set, if image must be filtered to grayscale so it will look like disabled icon.
+     *
+     * @param disabled true, if image must be grayed out for disabled state
+     * @return the current object, for convenience
+     * @since 10428
+     */
+    public ImageResource setDisabled(boolean disabled) {
+        this.isDisabled = disabled;
+        return this;
+    }
+
+    /**
      * Set both icons of an Action
      * @param a The action for the icons
@@ -145 +166 @@
             return new ImageIcon(img);
         }
+        BufferedImage bimg;
         if (svg != null) {
             Dimension realDim = GuiSizesHelper.getDimensionDpiAdjusted(dim);
-            BufferedImage bimg = ImageProvider.createImageFromSvg(svg, realDim);
+            bimg = ImageProvider.createImageFromSvg(svg, realDim);
             if (bimg == null) {
                 return null;
             }
-            if (overlayInfo != null) {
-                for (ImageOverlay o : overlayInfo) {
-                    o.process(bimg);
-                }
-            }
-            imgCache.put(dim, bimg);
-            return new ImageIcon(bimg);
         } else {
             if (baseImage == null) throw new AssertionError();
@@ -173 +188 @@
             }
             Image i = icon.getImage().getScaledInstance(realWidth, realHeight, Image.SCALE_SMOOTH);
-            BufferedImage bimg = new BufferedImage(realWidth, realHeight, BufferedImage.TYPE_INT_ARGB);
+            bimg = new BufferedImage(realWidth, realHeight, BufferedImage.TYPE_INT_ARGB);
             bimg.getGraphics().drawImage(i, 0, 0, null);
-            if (overlayInfo != null) {
-                for (ImageOverlay o : overlayInfo) {
-                    o.process(bimg);
-                }
-            }
-            imgCache.put(dim, bimg);
-            return new ImageIcon(bimg);
-        }
+        }
+        if (overlayInfo != null) {
+            for (ImageOverlay o : overlayInfo) {
+                o.process(bimg);
+            }
+        }
+        if (isDisabled) {
+            //Use default Swing functionality to make icon look disabled by applying grayscaling filter.
+            Icon disabledIcon = UIManager.getLookAndFeel().getDisabledIcon(null, new ImageIcon(bimg));
+
+            //Convert Icon to ImageIcon with BufferedImage inside
+            bimg = new BufferedImage(bimg.getWidth(), bimg.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+            disabledIcon.paintIcon(new JPanel(), bimg.getGraphics(), 0, 0);
+        }
+        imgCache.put(dim, bimg);
+        return new ImageIcon(bimg);
     }