From e1c4ec2ef5b31e10ee5e17ec8df83a2adadbcb01 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 11 Apr 2011 14:37:22 +0400 Subject: [PATCH] it was impossible to create subpackage in floating mode. fixed. --- .../src/com/intellij/ide/navigationToolbar/NavBarModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java index d439341e47d6..ccc16dddfa64 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java @@ -52,6 +52,7 @@ public class NavBarModel { private final Project myProject; private final NavBarModelListener myNotificator; private boolean myChanged = true; + private boolean shouldSkipUpdateFromDataContext = false; public NavBarModel(final Project project) { myProject = project; @@ -90,7 +91,7 @@ public class NavBarModel { } protected void updateModel(DataContext dataContext) { - if (LaterInvocator.isInModalContext()) return; + if (LaterInvocator.isInModalContext() || shouldSkipUpdateFromDataContext) return; PsiElement psiElement = LangDataKeys.PSI_FILE.getData(dataContext); if (psiElement == null) { @@ -116,6 +117,8 @@ public class NavBarModel { } } setChanged(false); + + shouldSkipUpdateFromDataContext = !UISettings.getInstance().SHOW_NAVIGATION_BAR; } protected void updateModel(final PsiElement psiElement) {