From a9398fbb13ffbc2ba79449b7d92b5f111a0cd1f5 Mon Sep 17 00:00:00 2001 From: Sasha Blashenkov Date: Wed, 13 Jul 2022 15:20:32 +0200 Subject: [PATCH] Fix RIDER-79086 Toolwindow doesn't remember its' state, fix RIDER-79648 Environment wizard is not shown if net5 is installed (without .net 6), fix RIDER-78120 Delete useless text from initial wizard, fix RIDER-79132 "Keymaps" layout is broken in the initial wizard (cherry picked from commit 049b8bfe83a1ba692138251ddfe72e450d0843b9) IJ-CR-27152 (cherry picked from commit e2eb6e4898ae93f3f74fbe9ba283aff594430468) (cherry picked from commit 775bea41457dfb3bc5b261f17d38aa8a913a3bf8) GitOrigin-RevId: 14c9c48ee6132ff3d9c933e8cbcf0bb939a69117 --- .../src/com/intellij/openapi/wm/impl/DesktopLayout.kt | 1 + .../src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt index 9a1ae85984a2..7bc168856550 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt @@ -58,6 +58,7 @@ class DesktopLayout(private val idToInfo: MutableMap = H } fun getInfo(id: String) = idToInfo.get(id) + fun getInfos() = idToInfo.toMap() internal fun addInfo(id: String, info: WindowInfoImpl) { val old = idToInfo.put(id, info) 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 0540499afa4e..463bada9936b 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 @@ -95,7 +95,7 @@ open class ToolWindowManagerImpl @NonInjectable @TestOnly internal constructor(v private val state: ToolWindowManagerState get() = project.service() - private var layoutState + var layoutState get() = state.layout set(value) { state.layout = value }