Changeset 7609 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-10-11T17:27:50+02:00 (10 years ago)

Author:

akks

Message:

Main.map.keyDetector was incorrectly skipping key release events,
happened when the dialog was opening on key press (i.e. in FastDraw plugin)

File:

• trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -125 +125 @@
             } else if (set.add((e.getKeyCode())) && enabled) {
                 synchronized (this) {
-                    for (KeyPressReleaseListener q: keyListeners) {
-                        q.doKeyPressed(e);
+                    if (isFocusInMainWindow()) {
+                        for (KeyPressReleaseListener q: keyListeners) {
+                            q.doKeyPressed(e);
+                        }
                     }
                 }
@@ -135 +137 @@
                 if (set.remove(e.getKeyCode()) && enabled) {
                     synchronized (this) {
-                        for (KeyPressReleaseListener q: keyListeners) {
-                            q.doKeyReleased(e);
+                        if (isFocusInMainWindow()) {
+                            for (KeyPressReleaseListener q: keyListeners) {
+                                q.doKeyReleased(e);
+                            }
                         }
                     }
@@ -165 +169 @@
         }
 
-        // check if key press is done in main window, not in dialogs
-        Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-        if (SwingUtilities.getWindowAncestor(focused) instanceof JFrame) {
-            processKeyEvent(ke);
-        }
+        processKeyEvent(ke);
     }
 
@@ -190 +190 @@
         this.enabled = enabled;
     }
+
+    private boolean isFocusInMainWindow() {
+        Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+        return SwingUtilities.getWindowAncestor(focused) instanceof JFrame;
+    }
 }