Changeset 16926 in josm

Timestamp:

2020-08-24T21:56:26+02:00 (4 years ago)

Author:

simon04

Message:

fix #19706 - Selection/Relation list: render primitive icons in HiDPI

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ImageResource.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/OsmPrimitiveImageProviderTest.java (modified) (2 diffs)

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

@@ -297 +297 @@
      */
     public ImageIcon getPaddedIcon(Dimension iconSize) {
+        final ImageIcon imageIcon = getImageIcon(iconSize);
+        if (imageIcon.getIconWidth() == iconSize.width && imageIcon.getIconHeight() == iconSize.height) {
+            // fast path for square and svg icons
+            return imageIcon;
+        }
+
         final Dimension cacheKey = new Dimension(-iconSize.width, -iconSize.height); // use negative width/height for differentiation
         BufferedImage image = imgCache.get(cacheKey);

trunk/test/unit/org/openstreetmap/josm/tools/OsmPrimitiveImageProviderTest.java

@@ -17 +17 @@
 import java.util.EnumSet;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+
+import javax.swing.ImageIcon;
 
 /**
@@ -58 +61 @@
         assertNotNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("way waterway=stream"), noDefault));
         assertNotNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("relation type=route route=railway"), noDefault));
+        // a non-square svg icon
+        final ImageIcon bankIcon = OsmPrimitiveImageProvider
+                .getResource(OsmUtils.createPrimitive("node amenity=bank"), Options.DEFAULT)
+                .getPaddedIcon(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
+        assertEquals(ImageProvider.ImageSizes.LARGEICON.getVirtualWidth(), bankIcon.getIconWidth());
+        assertEquals(ImageProvider.ImageSizes.LARGEICON.getVirtualHeight(), bankIcon.getIconHeight());
     }
 }