Changeset 18684 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-03-07T17:15:04+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix #22770: High precision scroll inputs may cause zoom events in the ImageDisplay

This is caused by the mouse wheel rotation being 0 (MouseWheelEvent#getWheelRotation )
which then caused the image viewer to perform a zoom event.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -365 +365 @@
                 currentVisibleRect.width = (int) (currentVisibleRect.width * ZOOM_STEP.get());
                 currentVisibleRect.height = (int) (currentVisibleRect.height * ZOOM_STEP.get());
-            } else {
+            } else if (rotation < 0) {
                 currentVisibleRect.width = (int) (currentVisibleRect.width / ZOOM_STEP.get());
                 currentVisibleRect.height = (int) (currentVisibleRect.height / ZOOM_STEP.get());
-            }
+            } // else rotation == 0, which can happen with some modern trackpads (see #22770)
 
             // Check that the zoom doesn't exceed MAX_ZOOM:1