ListModel sync tooltips

[fanfix.git] / ui / ListModel.java

diff --git a/ui/ListModel.java b/ui/ListModel.java
index 3029f61a04c43411da2400f5cf6fb75374dc1a81..137897aee45b68bbc682eae949fa8fcd9e15c230 100644 (file)
--- a/ui/ListModel.java
+++ b/ui/ListModel.java
@@ -275,11 +275,12 @@ public class ListModel<T> extends DefaultListModel6<T> {
                                        hoveredIndex = index;
                                        fireElementChanged(oldIndex);
                                        fireElementChanged(index);
-                                       
-                                       Window oldTooltip = tooltip;
-                                       tooltip = null;
-                                       if (oldTooltip != null) {
-                                               oldTooltip.setVisible(false);
+
+                                       synchronized (tooltipWatcher) {
+                                               if (tooltip != null) {
+                                                       tooltip.setVisible(false);
+                                               }
+                                               tooltip = null;
                                        }
 
                                        if (ListModel.this.tooltipCreator != null) {
@@ -293,12 +294,29 @@ public class ListModel<T> extends DefaultListModel6<T> {
 
                                                                        @Override
                                                                        protected void done() {
+                                                                               synchronized (tooltipWatcher) {
+                                                                                       if (tooltip != null) {
+                                                                                               tooltip.setVisible(false);
+                                                                                       }
+                                                                                       tooltip = null;
+                                                                               }
+
                                                                                if (index < 0
                                                                                                || index != hoveredIndex) {
                                                                                        return;
                                                                                }
 
-                                                                               tooltip = newTooltip(index, me);
+                                                                               if (popup != null
+                                                                                               && popup.isShowing()) {
+                                                                                       return;
+                                                                               }
+
+                                                                               synchronized (tooltipWatcher) {
+                                                                                       if (tooltip != null) {
+                                                                                               tooltip.setVisible(false);
+                                                                                       }
+                                                                                       tooltip = newTooltip(index, me);
+                                                                               }
                                                                        }
                                                                });
                                        }
@@ -340,6 +358,12 @@ public class ListModel<T> extends DefaultListModel6<T> {
                                                                list.locationToIndex(e.getPoint()));
                                        }
 
+                                       Window oldTooltip = tooltip;
+                                       tooltip = null;
+                                       if (oldTooltip != null) {
+                                               oldTooltip.setVisible(false);
+                                       }
+
                                        popup.show(list, e.getX(), e.getY());
                                }
                        }
@@ -564,16 +588,19 @@ public class ListModel<T> extends DefaultListModel6<T> {
                        newTooltip.addMouseListener(new MouseAdapter() {
                                @Override
                                public void mouseClicked(MouseEvent e) {
-
                                        Window promotedTooltip = tooltipCreator
                                                        .generateTooltip(value, false);
-                                       promotedTooltip.setLocation(newTooltip.getLocation());
+                                       if (promotedTooltip != null) {
+                                               promotedTooltip.setLocation(me.getXOnScreen(),
+                                                               me.getYOnScreen());
+                                               promotedTooltip.setVisible(true);
+                                       }
+                                       
                                        newTooltip.setVisible(false);
-                                       promotedTooltip.setVisible(true);
                                }
                        });
-                       newTooltip.setLocation(me.getXOnScreen(), me.getYOnScreen());
 
+                       newTooltip.setLocation(me.getXOnScreen(), me.getYOnScreen());
                        newTooltip.setVisible(true);
                }