MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Size of delayed events was mistakenly taken into account

Browse Source
This commit is contained in:
Denis Fokin
2018-02-16 20:11:09 +03:00
parent 07e9601559
commit ef4d03717d
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+23 -19
View File
@@ -1179,28 +1179,24 @@ public class IdeEventQueue extends EventQueue {
doPostEvent(event);
}
private boolean isPopupLosingFocus (AWTEvent e) {
private static boolean isFocusGoesIntoPopup(AWTEvent e) {
TYPEAHEAD_LOG.debug("Window event: " + e.paramString());
if (TYPEAHEAD_LOG.isDebugEnabled() && (e instanceof WindowEvent || e.getClass().getName().contains("SequencedEvent"))) {
TYPEAHEAD_LOG.debug("Window event: " + e.paramString());
}
if (e.getClass().getName().contains("SequencedEvent")) {
Field nestedField = ReflectionUtil.getDeclaredField(e.getClass(), "nested");
try {
WindowEvent nested = (WindowEvent)nestedField.get(e);
if (nested != null && isPopupLosingFocusFromWindowEvent(nested)) return true;
if (nested != null && isFocusGoesIntoPopupFromWindowEvent(nested)) return true;
}
catch (IllegalAccessException illegalAccessException) {
TYPEAHEAD_LOG.error(illegalAccessException);
}
}
if (isPopupLosingFocusFromWindowEvent(e)) return true;
if (isTypeaheadTimeoutExceeded(e)) {
TYPEAHEAD_LOG.debug("Clear delayed events because of IdeFrame deactivation");
delayKeyEvents.set(false);
myDelayedKeyEvents.clear();
lastTypeaheadTimestamp = 0;
};
if (isFocusGoesIntoPopupFromWindowEvent(e)) return true;
return false;
}
@@ -1209,22 +1205,20 @@ public class IdeEventQueue extends EventQueue {
if (!delayKeyEvents.get()) return false;
long currentTypeaheadDelay = System.currentTimeMillis() - lastTypeaheadTimestamp;
if (currentTypeaheadDelay > Registry.get("action.aware.typeaheadTimout").asDouble()) {
TYPEAHEAD_LOG.warn("Typeahead timeout is exceeded: " + currentTypeaheadDelay);
TYPEAHEAD_LOG.warn(new RuntimeException("Typeahead timeout is exceeded: " + currentTypeaheadDelay));
return true;
}
return false;
}
private static boolean isPopupLosingFocusFromWindowEvent(AWTEvent e) {
private static boolean isFocusGoesIntoPopupFromWindowEvent(AWTEvent e) {
if (e.getID() == WindowEvent.WINDOW_GAINED_FOCUS) {
WindowEvent windowEvent = (WindowEvent)e;
Window eventWindow = windowEvent.getWindow();
Window oppositeWindow = windowEvent.getOppositeWindow();
if (eventWindow.getClass().getName().contains("HeavyWeightWindow")) {
if (oppositeWindow instanceof IdeFrame) {
if (eventWindow.getClass().getName().contains("HeavyWeightWindow")) {
TYPEAHEAD_LOG.debug("Focus goes into HeavyWeightWindow");
return true;
}
}
}
return false;
}
@@ -1276,25 +1270,35 @@ public class IdeEventQueue extends EventQueue {
filter(s -> s instanceof KeyboardShortcut).map(s -> ((KeyboardShortcut)s).getFirstKeyStroke()).
anyMatch(ks -> ks.equals(KeyStroke.getKeyStroke(keyEvent.getKeyCode(), keyEvent.getModifiers())));
if (thisShortcutMayShowPopup) {
TYPEAHEAD_LOG.debug("Delay following events");
if (thisShortcutMayShowPopup && KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow() instanceof IdeFrame) {
TYPEAHEAD_LOG.debug("Delay following events; Focused window is " +
KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow().getClass().getName());
delayKeyEvents.set(true);
lastTypeaheadTimestamp = System.currentTimeMillis();
}
}
if (isTypeaheadTimeoutExceeded(event)) {
TYPEAHEAD_LOG.debug("Clear delayed events because of IdeFrame deactivation");
delayKeyEvents.set(false);
myDelayedKeyEvents.clear();
lastTypeaheadTimestamp = 0;
};
}
super.postEvent(event);
if (Registry.is("action.aware.typeAhead")) {
if (isPopupLosingFocus(event) && !myDelayedKeyEvents.isEmpty()) {
if (isFocusGoesIntoPopup(event)) {
delayKeyEvents.set(false);
int size = myDelayedKeyEvents.size();
TYPEAHEAD_LOG.debug("Stop delaying events. Events to post: " + size);
for (int keyEventIndex = 0; keyEventIndex < size; keyEventIndex++) {
KeyEvent theEvent = myDelayedKeyEvents.remove();
TYPEAHEAD_LOG.debug("Posted after delay: " + theEvent.paramString());
super.postEvent(theEvent);
}
TYPEAHEAD_LOG.debug("Events after posting: " + myDelayedKeyEvents.size());
}
}