Changeset 102 in josm for src/org/openstreetmap/josm/gui/MapMover.java

Timestamp:

2006-06-10T23:45:21+02:00 (20 years ago)

Author:

imi

Message:

• added more timestamp formats to GeoImage - date import (all ISO formats)
• changed insert node into segment mode to not move the new node out of line (except pressing Alt)
• fixed bug in Merger, where two new (but unrelated) segments got merged
• fixed NPE in MapMover when pressing Ctrl+- or Ctrl-- and mouse outside of JOSM
• added "modified" as search criteria for searching after modified elements

File:

• src/org/openstreetmap/josm/gui/MapMover.java (modified) (2 diffs)

src/org/openstreetmap/josm/gui/MapMover.java

@@ -2 +2 @@
 
 import java.awt.Cursor;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -32 +33 @@
             public void actionPerformed(ActionEvent e) {
                 if (action.equals("+") || action.equals("-")) {
-                        MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), nc.getMousePosition().x, nc.getMousePosition().y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals("+") ? -1 : 1);
+                        Point mouse = nc.getMousePosition();
+                        if (mouse == null)
+                                mouse = new Point((int)nc.getBounds().getCenterX(), (int)nc.getBounds().getCenterY());
+                        MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals("+") ? -1 : 1);
                         mouseWheelMoved(we);
                 } else {