Changeset 6227 in josm for trunk/src/org

Timestamp:

2013-09-09T02:48:51+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9055 - Changing Paste shortcut to a single key pasted in the center of screen, not at mouse location

File:

• trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -8 +8 @@
 import java.awt.MouseInfo;
 import java.awt.Point;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -88 +87 @@
         // default to paste in center of map (pasted via menu or cursor not in MapView)
         EastNorth mPosition = Main.map.mapView.getCenter();
-        if((e.getModifiers() & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0) {
+        // We previously checked for modifier to know if the action has been trigerred via shortcut or via menu
+        // But this does not work if the shortcut is changed to a single key (see #9055)
+        // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
+        if (!getValue(NAME).equals(e.getActionCommand())) {
             final Point mp = MouseInfo.getPointerInfo().getLocation();
             final Point tl = Main.map.mapView.getLocationOnScreen();