mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2847 Always dispatch KEY_TYPED event to the same component as KEY_PRESSED event

Browse Source 
also fixes JBR-2834, IDEA-254466, IDEA-254466

(cherry picked from commit e94f6057a4)
This commit is contained in:
Dmitry Batrak
2020-11-08 19:45:14 +03:00
committed by alexey.ushakov@jetbrains.com
parent e29f8dbd5f
commit d772f53b94
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
View File

@@ -79,6 +79,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
private LinkedList<TypeAheadMarker> typeAheadMarkers = new LinkedList<TypeAheadMarker>();
private boolean consumeNextKeyTyped;
private Component restoreFocusTo;
private Component keyPressedComponent;
private static boolean fxAppThreadIsDispatchThread;
@@ -869,7 +870,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
* @see Component#dispatchEvent
*/
public boolean dispatchKeyEvent(KeyEvent e) {
Component focusOwner = (((AWTEvent)e).isPosted) ? getFocusOwner() : e.getComponent();
Component focusOwner = (((AWTEvent)e).isPosted && e.getID() != KeyEvent.KEY_TYPED) ? getFocusOwner() : e.getComponent();
if (focusOwner != null && focusOwner.isShowing() && focusOwner.canBeFocusOwner()) {
if (!e.isConsumed()) {
@@ -1094,8 +1095,21 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
@SuppressWarnings("deprecation")
private boolean preDispatchKeyEvent(KeyEvent ke) {
if (((AWTEvent) ke).isPosted) {
Component focusOwner = getFocusOwner();
ke.setSource(((focusOwner != null) ? focusOwner : getFocusedWindow()));
Component focusOwner;
if (ke.getID() == KeyEvent.KEY_TYPED) {
focusOwner = keyPressedComponent;
} else {
focusOwner = getFocusOwner();
if (focusOwner == null) {
focusOwner = getFocusedWindow();
}
}
ke.setSource(focusOwner);
if (ke.getID() == KeyEvent.KEY_PRESSED) {
keyPressedComponent = focusOwner;
} else if (ke.getID() == KeyEvent.KEY_RELEASED) {
keyPressedComponent = null;
}
}
if (ke.getSource() == null) {
return true;