From 555d12b0d283068cd5f3e9fa06ad5c71cefdbab6 Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Sat, 1 Jul 2023 12:00:16 +0200 Subject: [PATCH] IDEA-299337 Tool window buttons: make it possible to move More icon GitOrigin-RevId: 43b8b41b62605cf69bd75b3e79dc4e79e9bd39ac --- .../intellij/openapi/wm/impl/ToolWindowManagerState.kt | 2 +- .../com/intellij/toolWindow/MoreSquareStripeButton.kt | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerState.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerState.kt index 19636e998c54..a03bcc6dc35e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerState.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerState.kt @@ -82,7 +82,7 @@ class ToolWindowManagerStateImpl : ToolWindowManagerState { } element.addContent(recentState) } - if (moreButton !== ToolWindowAnchor.LEFT) { + if (moreButton != ToolWindowAnchor.LEFT) { element.addContent(Element(MORE_BUTTON_TAG).setAttribute("side", moreButton.toString())) } return element diff --git a/platform/platform-impl/src/com/intellij/toolWindow/MoreSquareStripeButton.kt b/platform/platform-impl/src/com/intellij/toolWindow/MoreSquareStripeButton.kt index f0e47e3406ea..dd5136fdcbe1 100644 --- a/platform/platform-impl/src/com/intellij/toolWindow/MoreSquareStripeButton.kt +++ b/platform/platform-impl/src/com/intellij/toolWindow/MoreSquareStripeButton.kt @@ -63,8 +63,7 @@ internal class MoreSquareStripeButton(toolWindowToolbar: ToolWindowToolbar, } override fun isAvailable(project: Project): Boolean { - return super.isAvailable(project) && ToolWindowManagerEx.getInstanceEx( - project).getMoreButtonSide() == side + return super.isAvailable(project) && ToolWindowManagerEx.getInstanceEx(project).getMoreButtonSide() == side } override fun checkSkipPressForEvent(e: MouseEvent) = e.button != MouseEvent.BUTTON1 @@ -109,11 +108,7 @@ internal abstract class AbstractMoreSquareStripeButton(action: AnAction) : Abstr override fun update() { super.update() val project = dataContext.getData(CommonDataKeys.PROJECT) - if (project == null) { - return - } - - val available = isAvailable(project) + val available = project != null && isAvailable(project) myPresentation.isEnabledAndVisible = available isEnabled = available