From f087e5efa711d22454d7f33afa45396dfbf03d13 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 10 Mar 2011 14:29:33 +0300
Subject: [PATCH] double check that nav bar panel has repainted

---
 .../ide/navigationToolbar/NavBarPopup.java    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
index 1f713f3ff750..28d195a70478 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.navigationToolbar;
 
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.HintHint;
@@ -30,7 +31,10 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * @author Konstantin Bulenkov
@@ -68,9 +72,22 @@ public class NavBarPopup extends LightweightHint {
   }
 
   public void show(final NavBarItem item) {
+    show(item, true);
+  }
+
+  private void show(final NavBarItem item, boolean checkRepaint) {
     final RelativePoint point = new RelativePoint(item, new Point(0, item.getHeight()));
     final Point p = point.getPoint(myPanel);
-    show(myPanel, p.x, p.y, myPanel, new HintHint(myPanel, p));
+    if (p.x == 0 && p.y == 0 && checkRepaint) { // need repaint of nav bar panel
+      ApplicationManager.getApplication().invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          show(item, false); // end-less loop protection
+        }
+      });
+    } else {
+      show(myPanel, p.x, p.y, myPanel, new HintHint(myPanel, p));
+    }
   }
 
   private static JBList createPopupContent(final NavBarPanel panel, Object[] siblings, int selectedIndex) {