Changeset 7000 in josm

Timestamp:

2014-04-25T19:46:38+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9897 - avoid unwanted rectangle painting when moving map on Mac OS X

File:

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

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

@@ -65 +65 @@
  * If no object is under the mouse, move all selected objects (if any)
  *
- * On Mac OS, Ctrl + mouse button 1 simulates right click (map move), so the
+ * On Mac OS X, Ctrl + mouse button 1 simulates right click (map move), so the
  * feature "selection remove" is disabled on this platform.
  */
@@ -111 +111 @@
 
     private Mode mode = null;
-    private SelectionManager selectionManager;
+    private final SelectionManager selectionManager;
     private boolean cancelDrawMode = false;
     private boolean drawTargetHighlight;
@@ -500 +500 @@
 
         cancelDrawMode = true;
-        if (mode == Mode.select)
-            return;
+        if (mode == Mode.select) {
+            // Unregisters selectionManager if ctrl has been pressed after mouse click on Mac OS X in order to move the map
+            if (ctrl && Main.isPlatformOsx()) {
+                selectionManager.unregister(mv);
+                mv.requestClearRect();
+                // Make sure correct cursor is displayed
+                mv.setNewCursor(Cursor.MOVE_CURSOR, this);
+            }
+            return;
+        }
 
         // do not count anything as a move if it lasts less than 100 milliseconds.
@@ -567 +575 @@
     }
 
-
-
     @Override
     public void mouseExited(MouseEvent e) {
@@ -575 +581 @@
         }
     }
-
 
     @Override