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

[vcs-log] prepare for custom branch filter popup

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-11-09 18:12:05 +03:00
committed by Julia Beliaeva
parent e7c67bb7c2
commit 3c162f462d
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogPopupComponent.java
+8 -3
View File
@@ -146,12 +146,17 @@ public abstract class VcsLogPopupComponent extends JPanel {
}
private void showPopupMenu() {
ListPopup popup = JBPopupFactory.getInstance()
.createActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false);
ListPopup popup = createPopupMenu();
popup.showUnderneathOf(this);
}
@NotNull
protected ListPopup createPopupMenu() {
return JBPopupFactory.getInstance().
createActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false);
}
private static Border createFocusedBorder() {
return BorderFactory.createCompoundBorder(new RoundedLineBorder(UIUtil.getHeaderActiveColor(), 10, BORDER_SIZE), INNER_MARGIN_BORDER);
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
+11
View File
@@ -15,11 +15,14 @@
*/
package com.intellij.vcs.log.ui.filter;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.popup.PopupFactoryImpl;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.VcsLogBranchFilter;
@@ -84,6 +87,14 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen
return true;
}
@NotNull
@Override
protected ListPopup createPopupMenu() {
return new PopupFactoryImpl.ActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
false, false, false, false,
null, -1, null, null);
}
@Override
protected ActionGroup createActionGroup() {
DefaultActionGroup actionGroup = new DefaultActionGroup();