Changeset 16764 in josm for trunk

Timestamp:

2020-07-14T19:50:11+02:00 (4 years ago)

Author:

simon04

Message:

see #13173 - Fix cursor hotspot for HiDPI (patch by johsin18, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (4 diffs)

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

@@ -1330 +1330 @@
 
     /**
+     * The cursor hotspot constants {@link #DEFAULT_HOTSPOT} and {@link #CROSSHAIR_HOTSPOT} are relative to this cursor size
+     */
+    protected static final int CURSOR_SIZE_HOTSPOT_IS_RELATIVE_TO = 32;
+    private static final Point DEFAULT_HOTSPOT = new Point(3, 2);  // FIXME: define better hotspot for rotate.png
+    private static final Point CROSSHAIR_HOTSPOT = new Point(10, 10);
+
+    /**
      * Load a cursor image with a given file name, optionally decorated with an overlay image
      *
@@ -1345 +1352 @@
                                                 .setMaxSize(ImageSizes.CURSOROVERLAY)));
         }
-        hotSpot.setLocation("crosshair".equals(name) ? new Point(10, 10) : new Point(3, 2));
         ImageIcon imageIcon = imageProvider.get();
         Image image = imageIcon.getImage();
@@ -1361 +1367 @@
                 image = image.getScaledInstance(bestCursorSize.width, bestCursorSize.height, Image.SCALE_DEFAULT);
             }
-
-            hotSpot.x = hotSpot.x * bestCursorSize.width / width;
-            hotSpot.y = hotSpot.y * bestCursorSize.height / height;
-        }
+        }
+
+        hotSpot.setLocation("crosshair".equals(name) ? CROSSHAIR_HOTSPOT : DEFAULT_HOTSPOT);
+        hotSpot.x = hotSpot.x * image.getWidth(null) / CURSOR_SIZE_HOTSPOT_IS_RELATIVE_TO;
+        hotSpot.y = hotSpot.y * image.getHeight(null) / CURSOR_SIZE_HOTSPOT_IS_RELATIVE_TO;
 
         return image;

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

@@ -194 +194 @@
     }
 
-    public static final int ORIGINAL_CURSOR_SIZE = 32;
-
     /**
      * Test getting an image for a crosshair cursor.
@@ -215 +213 @@
     @Test
     public void testGetCursorImageWithOverlay() {
+        testCursorImageWithOverlay(1.0f);  // normal case
+        testCursorImageWithOverlay(1.5f);  // user has configured a GUI scale of 1.5 in the JOSM advanced preferences
+    }
+
+    private void testCursorImageWithOverlay(float guiScale) {
         if (GraphicsEnvironment.isHeadless()) {
             // TODO mock Toolkit.getDefaultToolkit().getBestCursorSize()
             return;
         }
+        GuiSizesHelper.setPixelDensity(guiScale);
         Point hotSpot = new Point();
         Image image = ImageProvider.getCursorImage("normal", "selection", hotSpot);
@@ -237 +241 @@
 
     private void assertCursorDimensionsCorrect(Point.Double originalHotspot, Image image, Point hotSpot) {
-        Dimension bestCursorSize = Toolkit.getDefaultToolkit().getBestCursorSize(ORIGINAL_CURSOR_SIZE, ORIGINAL_CURSOR_SIZE);
+        int originalCursorSize = ImageProvider.CURSOR_SIZE_HOTSPOT_IS_RELATIVE_TO;
+        Dimension bestCursorSize = Toolkit.getDefaultToolkit().getBestCursorSize(originalCursorSize, originalCursorSize);
         Image bestCursorImage = HiDPISupport.getResolutionVariant(image, bestCursorSize.width, bestCursorSize.height);
         int bestCursorImageWidth = bestCursorImage.getWidth(null);
@@ -243 +248 @@
         int bestCursorImageHeight = bestCursorImage.getHeight(null);
         assertEquals((int) Math.round(bestCursorSize.getHeight()), bestCursorImageHeight);
-        assertEquals(originalHotspot.x / ORIGINAL_CURSOR_SIZE * bestCursorImageWidth, hotSpot.x, 1 /* at worst one pixel off */);
-        assertEquals(originalHotspot.y / ORIGINAL_CURSOR_SIZE * bestCursorImageHeight, hotSpot.y, 1 /* at worst one pixel off */);
+        assertEquals(originalHotspot.x / originalCursorSize * bestCursorImageWidth, hotSpot.x, 1 /* at worst one pixel off */);
+        assertEquals(originalHotspot.y / originalCursorSize * bestCursorImageHeight, hotSpot.y, 1 /* at worst one pixel off */);
     }