Changeset 12722 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

Timestamp:

2017-09-04T18:52:06+02:00 (7 years ago)

Author:

bastiK

Message:

see #9995 - fix blurry GUI-icons and map view for Java 9 HiDPI mode

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
 import java.util.Objects;
 
@@ -16 +18 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.HiDPISupport;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -79 +82 @@
         if (iconRef != null) {
             fillImage = new MapImage(iconRef.iconName, iconRef.source, false);
-
-            color = new Color(fillImage.getImage(false).getRGB(
+            Image img = fillImage.getImage(false);
+            // get base image from possible multi-resolution image, so we can
+            // cast to BufferedImage and get pixel value at the center of the image
+            img = HiDPISupport.getBaseImage(img);
+            color = new Color(((BufferedImage) img).getRGB(
                     fillImage.getWidth() / 2, fillImage.getHeight() / 2)
             );