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: set Tree as a target component for toolbar in TreeActionsToolbarPanel

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-05-09 23:04:30 +03:00
parent b094b2edcc
commit 0322a81d8a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java
+1 -1
View File
@@ -113,7 +113,7 @@ abstract class SpecificFilesViewDialog extends DialogWrapper {
treeActions.add(cam.createExpandAllHeaderAction(expander, myView));
treeActions.add(cam.createCollapseAllHeaderAction(expander, myView));
JPanel toolbarPanel = new TreeActionsToolbarPanel(actionToolbar, treeActions);
JPanel toolbarPanel = new TreeActionsToolbarPanel(actionToolbar, treeActions, myView);
myPanel.add(toolbarPanel, BorderLayout.NORTH);
myPanel.add(ScrollPaneFactory.createScrollPane(myView), BorderLayout.CENTER);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeActionsToolbarPanel.java
+7 -5
View File
@@ -5,7 +5,9 @@ import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.ActionToolbar;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
@@ -15,19 +17,19 @@ public class TreeActionsToolbarPanel extends JPanel {
this(toolbar.getComponent(), tree);
}
public TreeActionsToolbarPanel(@NotNull ActionToolbar toolbar, @NotNull ActionGroup group) {
this(toolbar.getComponent(), group);
public TreeActionsToolbarPanel(@NotNull ActionToolbar toolbar, @NotNull ActionGroup group, @Nullable JComponent targetComponent) {
this(toolbar.getComponent(), group, targetComponent);
}
public TreeActionsToolbarPanel(@NotNull Component toolbarComponent, @NotNull ChangesTree tree) {
this(toolbarComponent, createTreeActions(tree));
this(toolbarComponent, createTreeActions(tree), tree);
}
public TreeActionsToolbarPanel(@NotNull Component toolbarComponent, @NotNull ActionGroup group) {
public TreeActionsToolbarPanel(@NotNull Component toolbarComponent, @NotNull ActionGroup group, @Nullable JComponent targetComponent) {
super(new BorderLayout());
ActionToolbar additionalToolbar = ActionManager.getInstance().createActionToolbar("TreeActionsToolbar", group, true);
additionalToolbar.setTargetComponent(this);
additionalToolbar.setTargetComponent(ObjectUtils.notNull(targetComponent, this));
additionalToolbar.setReservePlaceAutoPopupIcon(false);
add(toolbarComponent, BorderLayout.CENTER);