From 15524315b5ec6c9d0e5d439ec1c7820cb2a0d2cc Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 1 Oct 2019 22:26:08 +0300 Subject: [PATCH] IDEA-217612 Terminal rename session minimizes the terminal window Trying to skip tool window deactivation (in case of 'undock' mode) if focus goes to a balloon GitOrigin-RevId: 79d5b7ccf904219a8223c208086bc19dd53c1375 --- .../src/com/intellij/openapi/wm/impl/Windows.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java index e7853ba0d9a2..2c15fecf6887 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java @@ -5,6 +5,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.Shortcut; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; @@ -105,7 +106,9 @@ public class Windows { // A toolwindow lost focus ToolWindow activeToolWindow = ToolWindowManager.getActiveToolWindow(); + boolean focusGoesToPopup = JBPopupFactory.getInstance().getParentBalloonFor(focusEvent.getOppositeComponent()) != null; if (!focusEvent.isTemporary() && + !focusGoesToPopup && activeToolWindow != null && (activeToolWindow.isAutoHide() || activeToolWindow.getType() == ToolWindowType.SLIDING)) { pinnedWindowFocusLostHandler.accept(id);