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

allow extensions to override popup menu group

Browse Source
This commit is contained in:
Gregory.Shrago
2017-08-21 23:04:19 +03:00
parent d0ebc103c7
commit 01f34a3268
4 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModelExtension.java
+4 -2
View File
@@ -53,6 +53,8 @@ public interface NavBarModelExtension {
Collection<VirtualFile> additionalRoots(Project project);
@Nullable
@SuppressWarnings("unused")
default Object getData(String dataId, DataProvider provider) { return null; }
default Object getData(String dataId, @NotNull DataProvider provider) { return null; }
@Nullable
default String getPopupMenuGroup(@NotNull DataProvider provider) { return null; }
}
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+37 -25
View File
@@ -30,7 +30,6 @@ import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
import com.intellij.ide.projectView.impl.ProjectRootsUtil;
import com.intellij.ide.ui.UISettings;
import com.intellij.ide.ui.customization.CustomActionsSchema;
import com.intellij.ide.ui.customization.CustomizationUtil;
import com.intellij.ide.util.DeleteHandler;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
@@ -117,7 +116,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
myPresentation = new NavBarPresentation(myProject);
myUpdateQueue = new NavBarUpdateQueue(this);
CustomizationUtil.installPopupHandler(this, IdeActions.GROUP_NAVBAR_POPUP, ActionPlaces.NAVIGATION_BAR_POPUP);
installPopupHandler(this);
setOpaque(false);
if (!docked && UIUtil.isUnderDarcula()) {
setBorder(new LineBorder(Gray._120, 1));
@@ -169,11 +168,11 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
public List<NavBarItem> getItems() {
return Collections.unmodifiableList(myList);
}
public void addItem(NavBarItem item) {
myList.add(item);
}
public void clearItems() {
final NavBarItem[] toDispose = myList.toArray(new NavBarItem[myList.size()]);
myList.clear();
@@ -182,7 +181,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
Disposer.dispose(item);
}
});
getNavBarUI().clearItems();
}
@@ -389,10 +388,28 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
return !isShowing() ? null : (Window)UIUtil.findUltimateParent(this);
}
private void installPopupHandler(@NotNull JComponent component) {
ActionManager actionManager = ActionManager.getInstance();
PopupHandler.installPopupHandler(component, new ActionGroup() {
@NotNull
@Override
public AnAction[] getChildren(@Nullable AnActionEvent e) {
if (e == null) return EMPTY_ARRAY;
String popupGroup = null;
for (NavBarModelExtension modelExtension : Extensions.getExtensions(NavBarModelExtension.EP_NAME)) {
popupGroup = modelExtension.getPopupMenuGroup(NavBarPanel.this);
if (popupGroup != null) break;
}
if (popupGroup == null) popupGroup = IdeActions.GROUP_NAVBAR_POPUP;
return ((ActionGroup)actionManager.getAction(popupGroup)).getChildren(e);
}
}, ActionPlaces.NAVIGATION_BAR_POPUP, actionManager);
}
public void installActions(final int index, final NavBarItem component) {
//suppress it for a while
//installDnD(index, component);
installPopupHandler(component);
ListenerUtil.addMouseListener(component, new MouseAdapter() {
@Override
public void mouseReleased(final MouseEvent e) {
@@ -410,25 +427,18 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
private void click(final MouseEvent e) {
if (e.isConsumed()) return;
if (e.isPopupTrigger()) return;
if (e.isPopupTrigger()) {
if (e.getClickCount() == 1) {
ctrlClick(index);
myModel.setSelectedIndex(index);
IdeFocusManager.getInstance(myProject).requestFocus(NavBarPanel.this, true);
rightClick(index);
e.consume();
}
else if (!e.isPopupTrigger()) {
if (e.getClickCount() == 1) {
ctrlClick(index);
myModel.setSelectedIndex(index);
e.consume();
}
else if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
myModel.setSelectedIndex(index);
IdeFocusManager.getInstance(myProject).requestFocus(NavBarPanel.this, true);
doubleClick(index);
e.consume();
}
else if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
myModel.setSelectedIndex(index);
IdeFocusManager.getInstance(myProject).requestFocus(NavBarPanel.this, true);
doubleClick(index);
e.consume();
}
}
});
@@ -594,12 +604,14 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
@Override
@Nullable
public Object getData(String dataId) {
// First of all try to obtain data from extension
for (NavBarModelExtension modelExtension : Extensions.getExtensions(NavBarModelExtension.EP_NAME)) {
Object data = modelExtension.getData(dataId, this);
Object data = modelExtension.getData(dataId, this::getDataInner);
if (data != null) return data;
}
return getDataInner(dataId);
}
private Object getDataInner(String dataId) {
if (CommonDataKeys.PROJECT.is(dataId)) {
return !myProject.isDisposed() ? myProject : null;
}
@@ -648,7 +660,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
}
return !files.isEmpty() ? VfsUtilCore.toVirtualFileArray(files) : null;
}
if (CommonDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
final List<Navigatable> elements = getSelectedElements(Navigatable.class);
return elements == null || elements.isEmpty() ? null : elements.toArray(new Navigatable[elements.size()]);
@@ -845,7 +857,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
}
}
info.put("navBar", result.toString());
if (isNodePopupShowing()) {
StringBuilder popupText = new StringBuilder();
JBList list = myNodePopup.getList();
platform/platform-api/src/com/intellij/ui/PopupHandler.java
+4 -2
View File
@@ -58,10 +58,12 @@ public abstract class PopupHandler extends MouseAdapter {
}
public static void installPopupHandler(JComponent component, @NonNls String groupId, String place) {
ActionGroup group = (ActionGroup)ActionManager.getInstance().getAction(groupId);
installPopupHandler(component, group, place, ActionManager.getInstance());
ActionManager actionManager = ActionManager.getInstance();
ActionGroup group = (ActionGroup)actionManager.getAction(groupId);
installPopupHandler(component, group, place, actionManager);
}
@NotNull
public static MouseListener installPopupHandler(JComponent component, @NotNull final ActionGroup group, final String place, final ActionManager actionManager) {
if (ApplicationManager.getApplication() == null) return new MouseAdapter(){};
PopupHandler popupHandler = new PopupHandler() {
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java
+9 -16
View File
@@ -15,8 +15,10 @@
*/
package com.intellij.ide.ui.customization;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.keymap.impl.ui.Group;
import com.intellij.openapi.util.Pair;
@@ -34,8 +36,6 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.List;
@@ -276,17 +276,10 @@ public class CustomizationUtil {
return result.toArray(new ActionUrl[result.size()]);
}
public static MouseListener installPopupHandler(JComponent component, @NotNull final String groupId, final String place) {
if (ApplicationManager.getApplication() == null) return new MouseAdapter(){};
PopupHandler popupHandler = new PopupHandler() {
@Override
public void invokePopup(Component comp, int x, int y) {
ActionGroup group = (ActionGroup)CustomActionsSchema.getInstance().getCorrectedAction(groupId);
final ActionPopupMenu popupMenu = ActionManager.getInstance().createActionPopupMenu(place, group);
popupMenu.getComponent().show(comp, x, y);
}
};
component.addMouseListener(popupHandler);
return popupHandler;
@NotNull
public static MouseListener installPopupHandler(JComponent component, @NotNull String groupId, String place) {
ActionManager actionManager = ActionManager.getInstance();
ActionGroup group = (ActionGroup)actionManager.getAction(groupId);
return PopupHandler.installPopupHandler(component, group, place, actionManager);
}
}