From 017d156ddfe73f865d887a23f0b3224f617b35af Mon Sep 17 00:00:00 2001 From: "anna.gromova" Date: Wed, 16 Dec 2020 18:07:45 +0300 Subject: [PATCH] CWM-1592 CWM popup improvements CWM-1554 User should not explicitly CLICK on an item to get the sub menu GitOrigin-RevId: 76f324a6e8c7be9ecdb296aa332136740c485c41 --- .../StateWidgetRunConfigurationsAction.kt | 2 +- .../src/com/intellij/ui/popup/PopupFactoryImpl.java | 2 +- .../src/com/intellij/ui/popup/StateActionGroupPopup.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/execution-impl/src/com/intellij/execution/segmentedRunDebugWidget/StateWidgetRunConfigurationsAction.kt b/platform/execution-impl/src/com/intellij/execution/segmentedRunDebugWidget/StateWidgetRunConfigurationsAction.kt index 9ba064f87e26..c2f3c2fdb1b7 100644 --- a/platform/execution-impl/src/com/intellij/execution/segmentedRunDebugWidget/StateWidgetRunConfigurationsAction.kt +++ b/platform/execution-impl/src/com/intellij/execution/segmentedRunDebugWidget/StateWidgetRunConfigurationsAction.kt @@ -40,7 +40,7 @@ class StateWidgetRunConfigurationsAction : RunConfigurationsComboBoxAction() { val popup = StateActionGroupPopup(myPopupTitle, group, context, false, shouldShowDisabledActions(), false, false, - disposeCallback, maxRows, preselectCondition, null) { action -> + disposeCallback, maxRows, preselectCondition, null, false) { action -> if (action is FinalActionGroup) { StateWidgetManager.getInstance(action.project) .getActiveProcessesBySettings(action.configuration) diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java index b12ad0196180..2c524c196f4a 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -260,7 +260,7 @@ public class PopupFactoryImpl extends JBPopupFactory { return presentation; } - private static ListPopupStep createStep(@PopupTitle String title, + protected static ListPopupStep createStep(@PopupTitle String title, @NotNull ActionGroup actionGroup, @NotNull DataContext dataContext, boolean showNumbers, diff --git a/platform/platform-impl/src/com/intellij/ui/popup/StateActionGroupPopup.kt b/platform/platform-impl/src/com/intellij/ui/popup/StateActionGroupPopup.kt index 031919fe99df..1c2504b2a238 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/StateActionGroupPopup.kt +++ b/platform/platform-impl/src/com/intellij/ui/popup/StateActionGroupPopup.kt @@ -30,13 +30,14 @@ open class StateActionGroupPopup(@NlsContexts.PopupTitle title: String?, maxRowCount: Int, preselectActionCondition: Condition?, actionPlace: String?, + autoSelection: Boolean, val getState: (AnAction) -> String?) : PopupFactoryImpl.ActionGroupPopup(title, actionGroup, dataContext, showNumbers, useAlphaAsNumbers, showDisabledActions, honorActionMnemonics, disposeCallback, maxRowCount, preselectActionCondition, - actionPlace) { + actionPlace, autoSelection) { override fun createPopup(parent: WizardPopup?, step: PopupStep<*>?, parentValue: Any?): WizardPopup { return if (step is ListPopupStep<*>) {