From 1a97855dbf20e353c73da1cc315baca503c2a983 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 30 Nov 2010 15:39:09 +0300 Subject: [PATCH] IDEA-26828: Unable to delete task [rev. by spleaner] --- .../execution/actions/ChooseRunConfigurationAction.java | 6 ------ .../src/com/intellij/ui/popup/list/ListPopupImpl.java | 3 +-- platform/util/src/com/intellij/util/ui/UIUtil.java | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java index 95485e768ff4..215f4b787287 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java @@ -855,12 +855,6 @@ public class ChooseRunConfigurationAction extends AnAction { protected abstract void handleShiftClick(boolean handleFinalChoices, final InputEvent inputEvent, final RunListPopup popup); - @Override - protected boolean isActionClick(MouseEvent e) { - if (e.getButton() == MouseEvent.BUTTON2 || e.isPopupTrigger() || e.getID() != MouseEvent.MOUSE_PRESSED) return false; - return e.getButton() == MouseEvent.BUTTON1; - } - @Override protected ListCellRenderer getListElementRenderer() { return new RunListElementRenderer(this); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java index 691bdab391c9..795365338435 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java @@ -48,7 +48,6 @@ public class ListPopupImpl extends WizardPopup implements ListPopup { private int myMaxRowCount = 20; private boolean myAutoHandleBeforeShow; - public ListPopupImpl(ListPopupStep aStep, int maxRowCount) { super(aStep); if (maxRowCount != -1){ @@ -368,7 +367,7 @@ public class ListPopupImpl extends WizardPopup implements ListPopup { } protected boolean isActionClick(MouseEvent e) { - return UIUtil.isActionClick(e); + return UIUtil.isActionClick(e, MouseEvent.MOUSE_PRESSED, true); } private class MyMouseListener extends MouseAdapter { diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 1e9a588c7374..ad949ab26cfb 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -1016,7 +1016,11 @@ public class UIUtil { } public static boolean isActionClick(MouseEvent e, int effectiveType) { - if (isCloseClick(e) || e.isPopupTrigger() || e.getID() != effectiveType) return false; + return isActionClick(e, effectiveType, false); + } + + public static boolean isActionClick(MouseEvent e, int effectiveType, boolean allowShift) { + if ((!allowShift && isCloseClick(e)) || e.isPopupTrigger() || e.getID() != effectiveType) return false; return e.getButton() == MouseEvent.BUTTON1; }