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

Alt-Left/Right works in debugger toolwindow tabs (IDEA-63780)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-12-30 13:20:12 +01:00
parent a4801206c4
commit 1409f2a181
1 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
+54 -17
View File
@@ -1148,33 +1148,45 @@ public class JBTabsImpl extends JComponent
TabInfo result = null;
if (index > 0) {
result = findEnabledBackward(index - 1);
result = findEnabledBackward(index, false);
}
if (result == null) {
result = findEnabledForward(index + 1);
result = findEnabledForward(index, false);
}
return result;
}
private TabInfo findEnabledForward(int from) {
@Nullable
private TabInfo findEnabledForward(int from, boolean cycle) {
if (from < 0) return null;
int index = from;
while (index < myVisibleInfos.size() && index >= 0) {
while (index < myVisibleInfos.size()) {
index++;
if (cycle && index == myVisibleInfos.size()) {
index = 0;
}
if (index == from) break;
final TabInfo each = myVisibleInfos.get(index);
if (each.isEnabled()) return each;
index++;
}
return null;
}
private TabInfo findEnabledBackward(int from) {
@Nullable
private TabInfo findEnabledBackward(int from, boolean cycle) {
if (from < 0) return null;
int index = from;
while (index >= 0 && from < myVisibleInfos.size()) {
while (index >= 0) {
index--;
if (cycle && index == -1) {
index = myVisibleInfos.size()-1;
}
if (index == from) break;
final TabInfo each = myVisibleInfos.get(index);
if (each.isEnabled()) return each;
index--;
}
return null;
@@ -2696,13 +2708,37 @@ public class JBTabsImpl extends JComponent
e.getPresentation().setVisible(tabs != null);
if (tabs == null) return;
final int selectedIndex = tabs.myVisibleInfos.indexOf(tabs.getSelectedInfo());
final boolean enabled = tabs == myTabs && myTabs.isNavigationVisible() && selectedIndex >= 0 && myTabs.myNavigationActionsEnabled;
e.getPresentation().setEnabled(enabled);
if (enabled) {
_update(e, tabs, selectedIndex);
tabs = findNavigatableTabs(tabs);
e.getPresentation().setEnabled(tabs != null);
if (tabs != null) {
_update(e, tabs, tabs.myVisibleInfos.indexOf(tabs.getSelectedInfo()));
}
}
@Nullable
protected JBTabsImpl findNavigatableTabs(JBTabsImpl tabs) {
// The debugger UI contains multiple nested JBTabsImpl, where the innermost JBTabsImpl has only one tab. In this case,
// the action should target the outer JBTabsImpl.
if (tabs == null || tabs != myTabs) {
return null;
}
if (isNavigatable(tabs)) {
return tabs;
}
Component c = tabs.getParent();
while (c != null) {
if (c instanceof JBTabsImpl && isNavigatable((JBTabsImpl) c)) {
return (JBTabsImpl)c;
}
c = c.getParent();
}
return null;
}
private static boolean isNavigatable(JBTabsImpl tabs) {
final int selectedIndex = tabs.myVisibleInfos.indexOf(tabs.getSelectedInfo());
return tabs.isNavigationVisible() && selectedIndex >= 0 && tabs.myNavigationActionsEnabled;
}
public void reconnect(String actionId) {
myShadow.reconnect(myActionManager.getAction(actionId));
@@ -2712,6 +2748,7 @@ public class JBTabsImpl extends JComponent
public final void actionPerformed(final AnActionEvent e) {
JBTabsImpl tabs = e.getData(NAVIGATION_ACTIONS_KEY);
tabs = findNavigatableTabs(tabs);
if (tabs == null) return;
final int index = tabs.myVisibleInfos.indexOf(tabs.getSelectedInfo());
@@ -2729,11 +2766,11 @@ public class JBTabsImpl extends JComponent
}
protected void _update(final AnActionEvent e, final JBTabsImpl tabs, int selectedIndex) {
e.getPresentation().setEnabled(tabs.findEnabledForward(selectedIndex + 1) != null);
e.getPresentation().setEnabled(tabs.findEnabledForward(selectedIndex, true) != null);
}
protected void _actionPerformed(final AnActionEvent e, final JBTabsImpl tabs, final int selectedIndex) {
tabs.select(tabs.findEnabledForward(selectedIndex + 1), true);
tabs.select(tabs.findEnabledForward(selectedIndex, true), true);
}
}
@@ -2743,11 +2780,11 @@ public class JBTabsImpl extends JComponent
}
protected void _update(final AnActionEvent e, final JBTabsImpl tabs, int selectedIndex) {
e.getPresentation().setEnabled(tabs.findEnabledBackward(selectedIndex - 1) != null);
e.getPresentation().setEnabled(tabs.findEnabledBackward(selectedIndex, true) != null);
}
protected void _actionPerformed(final AnActionEvent e, final JBTabsImpl tabs, final int selectedIndex) {
tabs.select(tabs.findEnabledBackward(selectedIndex - 1), true);
tabs.select(tabs.findEnabledBackward(selectedIndex, true), true);
}
}