Changeset 7011 in josm for trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

Timestamp:

2014-04-27T13:58:10+02:00 (10 years ago)

Author:

bastiK

Message:

see #9897 - Move map no longer works on OSX (do not drag a rectangle when ctrl+left-click moving the map in download dialog)

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -19 +19 @@
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
+import org.openstreetmap.josm.Main;
 
 /**
@@ -44 +45 @@
     /** The speed increase per timer interval when a cursor button is clicked */
     private static final double ACCELERATION = 0.10;
+    
+    private static final int MAC_MOUSE_BUTTON3_MASK = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
 
     // start and end point of selection rectangle
@@ -118 +121 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON1) {
+        if (e.getButton() == MouseEvent.BUTTON1 && !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             iStartSelectionPoint = e.getPoint();
             iEndSelectionPoint = e.getPoint();
@@ -126 +129 @@
     @Override
     public void mouseDragged(MouseEvent e) {
-        if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK) {
+        if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK &&
+                !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             if (iStartSelectionPoint != null) {
                 iEndSelectionPoint = e.getPoint();