MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: simplify ComboBoxAction

Browse Source 
* show popup in the center if invoked with shortcut
  (no need to search related combobox on toolbar and show it there)
* do not set CUSTOM_COMPONENT_PROPERTY

follow-up:
57feca3f95
d76130c7ca
d619e4355f
This commit is contained in:
Aleksey Pivovarov
2017-03-02 18:39:04 +03:00
parent 6801ba058b
commit ed4232de35
2 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
-12
View File
@@ -53,18 +53,6 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
public static final Icon CHECKED_SELECTED_ICON = JBUI.scale(new SizedIcon(AllIcons.Actions.Checked_selected, 16, 16));
public static final Icon EMPTY_ICON = EmptyIcon.ICON_16;
@Override
public void actionPerformed(AnActionEvent e) {
if (e.getPresentation().getClientProperty(CUSTOM_COMPONENT_PROPERTY) == null) {
Project project = e.getProject();
IdeFrameImpl frame = project != null ? WindowManagerEx.getInstanceEx().getFrame(project) : null;
if (frame != null) {
e.getPresentation().putClientProperty(CUSTOM_COMPONENT_PROPERTY, frame.getComponent());
}
}
super.actionPerformed(e);
}
@Override
public void update(AnActionEvent e) {
Presentation presentation = e.getPresentation();
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+20 -31
View File
@@ -31,6 +31,8 @@ import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.IdeFrame;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.Gray;
import com.intellij.ui.JBColor;
@@ -60,30 +62,23 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
@Override
public void actionPerformed(AnActionEvent e) {
JComponent button = (JComponent)e.getPresentation().getClientProperty(CUSTOM_COMPONENT_PROPERTY);
if (button == null) {
Component contextComponent = e.getData(PlatformDataKeys.CONTEXT_COMPONENT);
JRootPane rootPane = UIUtil.getParentOfType(JRootPane.class, contextComponent);
if (rootPane != null) {
button = (ComboBoxButton)
UIUtil.uiTraverser(rootPane).bfsTraversal().filter(
component -> component instanceof ComboBoxButton && ((ComboBoxButton)component).getMyAction() == this).first();
}
if (button == null) return;
}
if (!button.isShowing()) return;
if (button instanceof ComboBoxButton) {
((ComboBoxButton)button).showPopup();
} else {
DataContext context = e.getDataContext();
Project project = e.getProject();
if (project == null) return;
DefaultActionGroup group = createPopupActionGroup(button, context);
ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
myPopupTitle, group, context, false, shouldShowDisabledActions(), false, null, getMaxRows(), getPreselectCondition());
popup.setMinimumSize(new Dimension(getMinWidth(), getMinHeight()));
popup.showCenteredInCurrentWindow(project);
}
Project project = e.getProject();
if (project == null) return;
JFrame frame = WindowManager.getInstance().getFrame(project);
if (!(frame instanceof IdeFrame)) return;
ListPopup popup = createActionPopup(e.getDataContext(), ((IdeFrame)frame).getComponent(), null);
popup.showCenteredInCurrentWindow(project);
}
@NotNull
private ListPopup createActionPopup(@NotNull DataContext context, @NotNull JComponent component, @Nullable Runnable disposeCallback) {
DefaultActionGroup group = createPopupActionGroup(component, context);
ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
myPopupTitle, group, context, false, shouldShowDisabledActions(), false, disposeCallback, getMaxRows(), getPreselectCondition());
popup.setMinimumSize(new Dimension(getMinWidth(), getMinHeight()));
return popup;
}
@Override
@@ -271,13 +266,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
}
protected JBPopup createPopup(Runnable onDispose) {
DataContext context = getDataContext();
DefaultActionGroup group = createPopupActionGroup(this, context);
ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
myPopupTitle, group, context, false, shouldShowDisabledActions(), false, onDispose, getMaxRows(), getPreselectCondition());
popup.setMinimumSize(new Dimension(getMinWidth(), getMinHeight()));
return popup;
return createActionPopup(getDataContext(), this, onDispose);
}
private ComboBoxAction getMyAction() {