Changeset 17235 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-10-18T13:24:50+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #19120 - fix #19954 - Disable Shift shortcuts in text fields

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java

@@ -3 +3 @@
 
 import java.awt.event.FocusEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -143 +144 @@
     protected void unregisterActionShortcuts() {
         unregisteredActionShortcuts.clear();
-        // Unregister all actions without modifiers to avoid them to be triggered by typing in this text field
+        // Unregister all actions with Shift modifier or without modifiers to avoid them to be triggered by typing in this text field
         for (Shortcut shortcut : Shortcut.listAll()) {
             KeyStroke ks = shortcut.getKeyStroke();
@@ -157 +158 @@
 
     /**
-     * Returns true if the given shortcut has no modifier and is not an actions key.
+     * Returns true if the given shortcut has Shift modifier or no modifier and is not an actions key.
      * @param ks key stroke
      * @return {@code true} if the given shortcut has to be disabled
@@ -163 +164 @@
      */
     protected boolean hasToBeDisabled(KeyStroke ks) {
-        return ks != null && ks.getModifiers() == 0 && !new KeyEvent(
+        return ks != null && (ks.getModifiers() == 0 || isOnlyShift(ks.getModifiers())) && !new KeyEvent(
                 this, KeyEvent.KEY_PRESSED, 0, ks.getModifiers(), ks.getKeyCode(), ks.getKeyChar()).isActionKey();
+    }
+
+    private static boolean isOnlyShift(int modifiers) {
+        return (modifiers & InputEvent.SHIFT_DOWN_MASK) != 0
+                && (modifiers & InputEvent.CTRL_DOWN_MASK) == 0
+                && (modifiers & InputEvent.ALT_DOWN_MASK) == 0
+                && (modifiers & InputEvent.ALT_GRAPH_DOWN_MASK) == 0
+                && (modifiers & InputEvent.META_DOWN_MASK) == 0;
     }