Changeset 6174 in josm for trunk/src

Timestamp:

2013-08-22T01:23:38+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8849 - use scaled down version of images in recently added tags panel

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MapImage.java (modified) (1 diff)
• MapPaintStyles.java (modified) (1 diff)
• NodeElemStyle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -150 +150 @@
         return new MapImageBoxProvider();
     }
+    
+    /**
+     * Returns the really displayed node icon for this {@code MapImage}.
+     * @param disabled {@code} true to request disabled version, {@code false} for the standard version
+     * @return The scaled down version to 16x16 pixels if the image size exceeds it and no size has been explicitely specified
+     * @since 6174
+     */
+    public Image getDisplayedNodeIcon(boolean disabled) {
+        final int maxSize = 16;
+        final Image image = disabled ? getDisabled() : getImage();
+        // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified
+        if ((width  == -1 && image.getWidth(null) > maxSize) 
+         || (height == -1 && image.getHeight(null) > maxSize)) {
+            return ImageProvider.createBoundedImage(image, maxSize);
+        } else {
+            return image;
+        }
+    }
 
     @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -140 +140 @@
                         if (mapImage != null) {
                             if (includeDeprecatedIcon || mapImage.name == null || !mapImage.name.equals("misc/deprecated.png")) {
-                                return new ImageIcon(mapImage.getImage());
+                                return new ImageIcon(mapImage.getDisplayedNodeIcon(false));
                             } else {
                                 return null; // Deprecated icon found but not wanted

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -235 +234 @@
     }
 
-    private Image getRealNodeIcon(final Image image) {
-        final int maxSize = 16;
-        // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified
-        if ((mapImage.width  == -1 && image.getWidth(null) > maxSize) 
-         || (mapImage.height == -1 && image.getHeight(null) > maxSize)) {
-            return ImageProvider.createBoundedImage(image, maxSize);
-        } else {
-            return image;
-        }
-    }
-    
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
@@ -254 +242 @@
                 if (painter.isInactiveMode() || n.isDisabled()) {
                     if (disabledNodeIcon == null) {
-                        disabledNodeIcon = getRealNodeIcon(mapImage.getDisabled());
+                        disabledNodeIcon = mapImage.getDisplayedNodeIcon(true);
                     }
                     nodeIcon = disabledNodeIcon;
                 } else {
                     if (enabledNodeIcon == null) {
-                        enabledNodeIcon = getRealNodeIcon(mapImage.getImage());
+                        enabledNodeIcon = mapImage.getDisplayedNodeIcon(false);
                     }
                     nodeIcon = enabledNodeIcon;