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

Timestamp:

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

Author:

stoecker

Message:

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

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (4 diffs)

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

@@ -109 +109 @@
 
     /**
+     * Supported image sizes
+     * @since 7687
+     */
+    public static enum ImageSizes {
+        /* SMALL_ICON value of on Action */
+        SMALLICON,
+        /* LARGE_ICON_KEY value of on Action */
+        LARGEICON,
+        /* MAP icon */
+        MAP,
+        /* MAP icon maximum size*/
+        MAPMAX,
+    }
+
+    /**
      * Property set on {@code BufferedImage} returned by {@link #makeImageTransparent}.
      * @since 7132
@@ -218 +233 @@
 
     /**
+     * Convert enumarated size values to real numbers
+     * @return dimension of imagei
+     * @since 7687
+     */
+    public Dimension getImageSizes(ImageSizes size) {
+        int sizeval;
+        switch(size) {
+        case MAPMAX: sizeval = Main.pref.getInteger("iconsize.mapmax", 48); break;
+        case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
+        case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
+        case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
+        default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
+        }
+        return new Dimension(sizeval, sizeval);
+    }
+    
+    /**
      * Set the dimensions of the image.
      *
@@ -232 +264 @@
 
     /**
+     * Set the dimensions of the image.
+     *
+     * If not specified, the original size of the image is used.
+     * @return the current object, for convenience
+     * @since 7687
+     */
+    public ImageProvider setSize(ImageSizes size) {
+        return setSize(getImageSizes(size));
+    }
+
+    /**
      * @see #setSize
      * @return the current object, for convenience
@@ -262 +305 @@
         this.maxHeight = maxSize.height;
         return this;
+    }
+
+    /**
+     * Limit the maximum size of the image.
+     *
+     * It will shrink the image if necessary, but keep the aspect ratio.
+     * The given width or height can be -1 which means this direction is not bounded.
+     *
+     * 'size' and 'maxSize' are not compatible, you should set only one of them.
+     * @return the current object, for convenience
+     * @since 7687
+     */
+    public ImageProvider setMaxSize(ImageSizes size) {
+        return setMaxSize(getImageSizes(size));
     }