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

Only underwave up to [nearest] module

Browse Source
This commit is contained in:
Maxim Shafirov
2009-09-11 22:14:01 +04:00
parent 945e1d112d
commit 7aa6565a1a
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+6 -19
View File
@@ -501,23 +501,6 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
e.consume();
}
}
public void mouseExited(final MouseEvent e) {
if (!hasChildren) return;
component.getLabel().setIcon(wrapIcon(icon, index, Color.gray));
}
});
ListenerUtil.addMouseMotionListener(component, new MouseMotionAdapter() {
public void mouseMoved(MouseEvent e) {
if (!hasChildren) return;
if (isInsideIcon(e.getPoint(), icon)) {
component.getLabel().setIcon(wrapIcon(icon, index, Color.black));
}
else {
component.getLabel().setIcon(wrapIcon(icon, index, Color.gray));
}
}
});
}
@@ -585,10 +568,13 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
}
return FINAL_CHOICE;
}
/*
public void canceled() {
super.canceled();
item.getLabel().setIcon(wrapIcon(NavBarModel.getIcon(object), index, Color.gray));
}
*/
};
step.setDefaultOptionIndex(index < myModel.size() - 1 ? objects.indexOf(myModel.getElement(index + 1)) : 0);
myNodePopup = new ListPopupImpl(step) {
@@ -880,9 +866,10 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
public boolean value(final VirtualFile virtualFile) {
if (scope instanceof PsiDirectory) {
final PsiDirectory directory = (PsiDirectory)scope;
return VfsUtil.isAncestor(directory.getVirtualFile(), virtualFile, false);
if (!VfsUtil.isAncestor(directory.getVirtualFile(), virtualFile, false)) return false;
return ModuleUtil.findModuleForFile(virtualFile, scope.getProject()) == ModuleUtil.findModuleForPsiElement(scope);
}
else if (scope instanceof PsiDirectoryContainer) {
else if (scope instanceof PsiDirectoryContainer) { // TODO: remove. It doesn't look like we'll have packages in navbar ever again
final PsiDirectory[] psiDirectories = ((PsiDirectoryContainer)scope).getDirectories();
for (PsiDirectory directory : psiDirectories) {
if (VfsUtil.isAncestor(directory.getVirtualFile(), virtualFile, false)) {