Changeset 9584 in osm for applications/viewer

Timestamp:

2008-08-09T12:42:17+02:00 (16 years ago)

Author:

stotz

Message:

Missing check for right mouse button on movement added

File:

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

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

@@ -17 +17 @@
  * 
  */
-public class DefaultMapController extends JMapController implements MouseListener,
-                MouseMotionListener, MouseWheelListener {
+public class DefaultMapController extends JMapController implements
+                MouseListener, MouseMotionListener, MouseWheelListener {
+
+        private static final int MOUSE_BUTTONS_MASK = MouseEvent.BUTTON3_DOWN_MASK
+                        | MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
 
         public DefaultMapController(JMapViewer map) {
@@ -38 +41 @@
                 if (!movementEnabled || !isMoving)
                         return;
-                if (lastDragPoint != null) {
-                        Point p = e.getPoint();
-                        int diffx = lastDragPoint.x - p.x;
-                        int diffy = lastDragPoint.y - p.y;
-                        map.moveMap(diffx, diffy);
+                // Is only right mouse button presed?
+                if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == MouseEvent.BUTTON3_DOWN_MASK) {
+
+                        if (lastDragPoint != null) {
+                                Point p = e.getPoint();
+                                int diffx = lastDragPoint.x - p.x;
+                                int diffy = lastDragPoint.y - p.y;
+                                map.moveMap(diffx, diffy);
+                        }
+                        lastDragPoint = e.getPoint();
                 }
-                lastDragPoint = e.getPoint();
         }
 
         public void mouseClicked(MouseEvent e) {
-                if (doubleClickZoomEnabled && e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
+                if (doubleClickZoomEnabled && e.getClickCount() == 2
+                                && e.getButton() == MouseEvent.BUTTON1)
                         map.zoomIn(e.getPoint());
         }