Changeset 18767 in josm for trunk/src

Timestamp:

2023-06-22T22:13:03+02:00 (20 months ago)

Author:

taylor.smock

Message:

Fix #23015, see #2483: Right click (map move) + scale/rotate modes should not interfere with each other

The workaround added for #2483 (r1634, Java 5) does not appear to be needed
anymore (tested with a Magic Mouse in one-button mode under Java 8). Removing
the workaround fixes the behavior whereby a right-click will cause the
scale/rotate mode to be enabled.

To fix extraneous commands being generated during a map pan when scale/rotate
mode is enabled, we check to see if the right mouse button is down in
updateCommandWhileDragging.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -24 +24 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.actions.MergeNodesAction;
@@ -480 +481 @@
     @Override
     public void mouseMoved(MouseEvent e) {
-        // Mac OSX simulates with ctrl + mouse 1 the second mouse button hence no dragging events get fired.
-        if (PlatformManager.isPlatformOsx() && (mode == Mode.ROTATE || mode == Mode.SCALE)) {
-            mouseDragged(e);
-            return;
-        }
         oldEvent = e;
         if (giveUserFeedback(e)) {
@@ -571 +567 @@
             virtualManager.createMiddleNodeFromVirtual(currentEN);
         } else {
-            if (!updateCommandWhileDragging(currentEN)) return;
+            if (!updateCommandWhileDragging(e, currentEN)) return;
         }
 
@@ -713 +709 @@
      * Create or update data modification command while dragging mouse - implementation of
      * continuous moving, scaling and rotation
+     * @param mouseEvent The triggering mouse event
      * @param currentEN - mouse position
      * @return status of action (<code>true</code> when action was performed)
      */
-    private boolean updateCommandWhileDragging(EastNorth currentEN) {
+    private boolean updateCommandWhileDragging(MouseEvent mouseEvent, EastNorth currentEN) {
         // Currently we support only transformations which do not affect relations.
         // So don't add them in the first place to make handling easier
@@ -789 +786 @@
             startEN = currentEN; // drag can continue after scaling/rotation
 
-            if (mode != Mode.ROTATE && mode != Mode.SCALE) {
+            if (mode != Mode.ROTATE && mode != Mode.SCALE || SwingUtilities.isRightMouseButton(mouseEvent)) {
                 return false;
             }