From 4f5e47de0d283c1ede83806fe4066db3da8a8183 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 15 Jan 2020 13:14:51 +0100 Subject: [PATCH] IDEA-229717 Tool window in "Window" view mode stays open on changing View mode to "Dock Pinned" GitOrigin-RevId: 661a229367ada328a80e4041ad96228d362c7ee4 --- .../src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt index d3b3174f8c9e..a704d2f28707 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt @@ -1019,11 +1019,13 @@ open class ToolWindowManagerImpl(val project: Project) : ToolWindowManagerEx(), private fun removeDecoratorWithoutUpdatingState(entry: ToolWindowEntry, info: WindowInfoImpl, dirtyMode: Boolean) { entry.windowedDecorator?.let { + entry.windowedDecorator = null Disposer.dispose(it) return } entry.floatingDecorator?.let { + entry.floatingDecorator = null it.dispose() return } @@ -1043,7 +1045,6 @@ open class ToolWindowManagerImpl(val project: Project) : ToolWindowManagerEx(), entry.windowedDecorator?.let { windowedDecorator -> info.isActiveOnStart = windowedDecorator.isActive - entry.windowedDecorator = null val frame = windowedDecorator.getFrame() if (frame.isShowing) { val maximized = (frame as JFrame).extendedState == Frame.MAXIMIZED_BOTH