Changeset 30406 in osm for applications/viewer/jmapviewer

Timestamp:

2014-04-18T15:52:13+02:00 (11 years ago)

Author:

bastik

Message:

see #josm9897 - Move map no longer works on OSX

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (modified) (3 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

@@ -44 +44 @@
             return;
         // Is only the selected mouse button pressed?
-        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == movementMouseButtonMask) {
+        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == movementMouseButtonMask || isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  moving");
+            }
             Point p = e.getPoint();
             if (lastDragPoint != null) {
@@ -64 +67 @@
     public void mousePressed(MouseEvent e) {
         debugMouseEvent("DefaultMapController.mousePressed", e);
+        
         if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  move start");
+            }
             lastDragPoint = null;
             isMoving = true;
@@ -73 +80 @@
         debugMouseEvent("DefaultMapController.mouseReleased", e);
         if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {
+            if (JMapViewer.debug) {
+                System.err.println("(#9897)  move stop");
+            }
             lastDragPoint = null;
             isMoving = false;