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

IDEA-142244 Context menu on Find tool window tabs doesn't work correctly

Browse Source 
+Hide disabled Close Tab / Close All / Close Other / Select Next / Select Previous
This commit is contained in:
Vassiliy.Kudryashov
2015-07-09 14:47:14 +03:00
parent 80bfff5228
commit 6d09764a02
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/ShowContentAction.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class ShowContentAction extends AnAction implements DumbAware {
@Override
public void update(AnActionEvent e) {
final ToolWindow window = getWindow(e);
e.getPresentation().setEnabled(window != null && window.getContentManager().getContentCount() > 1);
e.getPresentation().setEnabledAndVisible(window != null && window.getContentManager().getContentCount() > 1);
e.getPresentation().setText(window == null || window.getContentUiType() == ToolWindowContentUiType.TABBED
? "Show List of Tabs"
: "Show List of Views");
platform/platform-impl/src/com/intellij/ui/content/tabs/TabbedContentAction.java
+7 -10
View File
@@ -76,15 +76,14 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
public void update(AnActionEvent e) {
Presentation presentation = e.getPresentation();
presentation.setEnabled(myContent != null && myManager.canCloseContents() && myContent.isCloseable() && myManager.isSelected(myContent));
presentation.setVisible(myManager.canCloseContents() && myContent.isCloseable());
presentation.setEnabledAndVisible(myManager.canCloseContents() && myContent.isCloseable());
presentation.setText(myManager.getCloseActionName());
}
}
public static class CloseAllButThisAction extends ForContent {
public CloseAllButThisAction(Content content) {
public CloseAllButThisAction(@NotNull Content content) {
super(content, ActionManager.getInstance().getAction(IdeActions.ACTION_CLOSE_ALL_EDITORS_BUT_THIS), UIBundle.message("tabbed.pane.close.all.but.this.action.name"));
}
@@ -101,11 +100,10 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
public void update(AnActionEvent e) {
Presentation presentation = e.getPresentation();
presentation.setText(myManager.getCloseAllButThisActionName());
presentation.setEnabled(myContent != null && myManager.canCloseContents() && myManager.getContentCount() > 1);
presentation.setVisible(myManager.canCloseContents() && hasCloseableContents());
presentation.setEnabledAndVisible(myManager.canCloseContents() && hasOtherCloseableContents());
}
private boolean hasCloseableContents() {
private boolean hasOtherCloseableContents() {
Content[] contents = myManager.getContents();
for (Content content : contents) {
if (myContent != content && content.isCloseable()) {
@@ -132,8 +130,7 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
public void update(AnActionEvent e) {
Presentation presentation = e.getPresentation();
presentation.setEnabled(myManager.canCloseAllContents());
presentation.setVisible(myManager.canCloseAllContents());
presentation.setEnabledAndVisible(myManager.getContentCount() > 1 && myManager.canCloseAllContents());
}
}
public static class MyNextTabAction extends TabbedContentAction {
@@ -146,7 +143,7 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
}
public void update(AnActionEvent e) {
e.getPresentation().setEnabled(myManager.getContentCount() > 1);
e.getPresentation().setEnabledAndVisible(myManager.getContentCount() > 1);
e.getPresentation().setText(myManager.getNextContentActionName());
}
}
@@ -161,7 +158,7 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
}
public void update(AnActionEvent e) {
e.getPresentation().setEnabled(myManager.getContentCount() > 1);
e.getPresentation().setEnabledAndVisible(myManager.getContentCount() > 1);
e.getPresentation().setText(myManager.getPreviousContentActionName());
}
}