Changeset 6993 in josm for trunk

Timestamp:

2014-04-22T09:40:38+02:00 (11 years ago)

Author:

bastiK

Message:

see #9397 - Move map no longer works on OSX (fix selection rectagle on map move)

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (3 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)
  *
- * @author imi
+ * On Mac OS, Ctrl + mouse button 1 simulates right click (map move), so the
+ * feature "selection remove" is disabled on this platform.
  */
 public class SelectAction extends MapMode implements AWTEventListener, SelectionEnded {
@@ -337 +338 @@
                 c = "lasso";
             } else {
-                c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : ""));
+                c = "rect" + (shift ? "_add" : (ctrl && !Main.isPlatformOsx() ? "_rm" : ""));
             }
             break;
@@ -457 +458 @@
         case select:
         default:
-            // start working with rectangle or lasso
-            selectionManager.register(mv, lassoMode);
-            selectionManager.mousePressed(e);
-            break;
+            if (!(ctrl && Main.isPlatformOsx())) {
+                // start working with rectangle or lasso
+                selectionManager.register(mv, lassoMode);
+                selectionManager.mousePressed(e);
+                break;
+            }
         }
         if (giveUserFeedback(e)) {