rollback autopopup. Use Up/Down on file instead

This commit is contained in:
Konstantin Bulenkov
2011-04-07 16:15:50 +04:00
parent 0263288ac3
commit a356e97387
5 changed files with 15 additions and 5 deletions
@@ -36,7 +36,7 @@ public class ActivateNavigationBarAction extends AnAction implements DumbAware {
final IdeFrameImpl frame = WindowManagerEx.getInstanceEx().getFrame(project);
final IdeRootPane ideRootPane = ((IdeRootPane)frame.getRootPane());
final NavBarPanel navBarPanel = (NavBarPanel)ideRootPane.findByName(NavBarRootPaneExtension.NAV_BAR).getComponent();
navBarPanel.activatePopupOnLastElement(e.getDataContext());
navBarPanel.selectTail();
}
}
@@ -29,6 +29,7 @@ public enum NavBarKeyboardCommand {
HOME(KeyEvent.VK_HOME),
END(KeyEvent.VK_END),
DOWN(KeyEvent.VK_DOWN),
UP(KeyEvent.VK_UP),
ENTER(KeyEvent.VK_ENTER),
NAVIGATE(KeyEvent.VK_F4),
ESCAPE(KeyEvent.VK_ESCAPE);
@@ -113,6 +113,7 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
case HOME: myPanel.moveHome(); break;
case END: myPanel.moveEnd(); break;
case DOWN: myPanel.moveDown(); break;
case UP: myPanel.moveDown(); break;
case ENTER: myPanel.enter(); break;
case ESCAPE: myPanel.escape(); break;
case NAVIGATE: myPanel.navigate(); break;
@@ -94,6 +94,7 @@ public class NavBarPanel extends OpaquePanel.List implements DataProvider, Popup
private NavBarItem myContextObject;
private boolean myDisposed = false;
private RelativePoint myLocationCache;
private boolean initialized = false;
public NavBarPanel(final Project project) {
@@ -171,8 +172,14 @@ public class NavBarPanel extends OpaquePanel.List implements DataProvider, Popup
}
public void moveDown() {
if (myModel.getSelectedIndex() != -1) {
ctrlClick(myModel.getSelectedIndex());
final int index = myModel.getSelectedIndex();
if (index != -1) {
if (myModel.size() - 1 == index) {
shiftFocus(-1);
ctrlClick(index - 1);
} else {
ctrlClick(index);
}
}
}
@@ -719,7 +726,7 @@ public class NavBarPanel extends OpaquePanel.List implements DataProvider, Popup
}
});
}
activatePopupOnLastElement();
selectTail();
}
}, NavBarUpdateQueue.ID.SHOW_HINT);
@@ -741,6 +748,7 @@ public class NavBarPanel extends OpaquePanel.List implements DataProvider, Popup
myModel.setSelectedIndex(Math.max(myList.size() - 2, 0));
IdeFocusManager.getInstance(myProject).requestFocus(NavBarPanel.this, true);
restorePopup();
initialized = true;
}
}
});
@@ -72,7 +72,7 @@ public class SelectInNavBarTarget extends SelectInTargetPsiWrapper implements Du
if (navBarExt != null) {
final JComponent c = navBarExt.getComponent();
final NavBarPanel panel = (NavBarPanel)c.getClientProperty("NavBarPanel");
panel.activatePopupOnLastElement();
panel.selectTail();
}
}
}