From 4daa4f49eaf280403e8db0a04b0c69223b74be2b Mon Sep 17 00:00:00 2001 From: Alexandr Suhinin Date: Mon, 5 Jun 2023 10:14:19 +0300 Subject: [PATCH] [floating toolbar] IDEA-314026: don't request focus in popup menu allow default action shortcuts while popup is active GitOrigin-RevId: 2e7a575d46c3ff7713f9a67a29b39132612b3df2 --- .../intellij/ui/codeFloatingToolbar/DropdownActionGroup.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ui/codeFloatingToolbar/DropdownActionGroup.kt b/platform/lang-impl/src/com/intellij/ui/codeFloatingToolbar/DropdownActionGroup.kt index 9f7612a49aad..c31f21dbee98 100644 --- a/platform/lang-impl/src/com/intellij/ui/codeFloatingToolbar/DropdownActionGroup.kt +++ b/platform/lang-impl/src/com/intellij/ui/codeFloatingToolbar/DropdownActionGroup.kt @@ -4,6 +4,7 @@ package com.intellij.ui.codeFloatingToolbar import com.intellij.openapi.actionSystem.* import com.intellij.openapi.actionSystem.ex.CustomComponentAction import com.intellij.openapi.actionSystem.impl.ActionButtonWithText +import com.intellij.ui.popup.PopupFactoryImpl import javax.swing.JComponent class DropdownActionGroup: DefaultActionGroup(), CustomComponentAction { @@ -11,7 +12,10 @@ class DropdownActionGroup: DefaultActionGroup(), CustomComponentAction { override fun createCustomComponent(presentation: Presentation, place: String): JComponent { return object: ActionButtonWithText(this, presentation, place, ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE) { override fun actionPerformed(event: AnActionEvent) { - showActionGroupPopup(this@DropdownActionGroup, event) + val popup = PopupFactoryImpl.getInstance().createActionGroupPopup(null, this@DropdownActionGroup, + event.dataContext, null, true) + popup.setRequestFocus(false) + popup.showUnderneathOf(this) } } }