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

Esc should not move focus from Terminal to Editor

Browse Source
This commit is contained in:
Denis Fokin
2017-09-26 12:43:09 +03:00
parent 7c146fd7e8
commit 24ffaeffb0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java
+4 -3
View File
@@ -116,6 +116,7 @@ public class Windows {
// FocusEvent
// for now we are interested in focus lost events
String id = ToolWindowManager.getActiveId();
if (event.getID() == FocusEvent.FOCUS_LOST) {
// let's check that it is a toolwindow who loses the focus
@@ -126,17 +127,17 @@ public class Windows {
// A toolwindow lost focus
if (!focusEvent.isTemporary() && ToolWindowManager.getActiveToolWindow() != null && ToolWindowManager.getActiveToolWindow().isAutoHide()) {
pinnedWindowFocusLostHandler.accept(ToolWindowManager.getActiveId());
pinnedWindowFocusLostHandler.accept(id);
}
}
}
if (event.getID() == KeyEvent.KEY_PRESSED && !isHeavyWeightPopup(event))
if (event.getID() == KeyEvent.KEY_PRESSED && !isHeavyWeightPopup(event) && !("Terminal").equals(id))
{
if (Arrays.stream(findShortcuts("EditorEscape"))
.anyMatch(shortcut -> shortcut.equals(new KeyboardShortcut(KeyStroke.getKeyStrokeForEvent((KeyEvent)event), null))))
{
deactivationShortcutHandler.accept(ToolWindowManager.getActiveId());
deactivationShortcutHandler.accept(id);
}
}
}