From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 3 Jun 2013 13:00:34 +0000 (+0300)
Subject: Merge commit '34e6c60a5a746c0306c3a84ae8d6c21dfd84d878' into 7.1
X-Git-Tag: 7.1.0~90
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c36784ad2853d0187f69ef8f023717aa7bade12;p=vaadin-framework.git

Merge commit '34e6c60a5a746c0306c3a84ae8d6c21dfd84d878' into 7.1

#11448 is fixed in a different way for 7.1 because the tooltip event
handling has been slightly refactored.

Change-Id: I50db48ffdce22cdf6598daafcb022fc43ed11cf4
---

6c36784ad2853d0187f69ef8f023717aa7bade12
diff --cc client/src/com/vaadin/client/ui/window/WindowConnector.java
index a394a33882,beaf549dcf..4b839384a2
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@@ -313,14 -392,4 +392,13 @@@ public class WindowConnector extends Ab
      public void setWindowOrderAndPosition() {
          getWidget().setWindowOrderAndPosition();
      }
 +
 +    @Override
-     public TooltipInfo getTooltipInfo(com.google.gwt.dom.client.Element element) {
++    public boolean hasTooltip() {
 +        /*
-          * Override method to make AbstractComponentConnector.hasTooltip()
-          * return true so there's a top level handler that takes care of hiding
-          * tooltips whenever the mouse is moved somewhere else.
++         * Tooltip event handler always needed on the window widget to make sure
++         * tooltips are properly hidden. (#11448)
 +         */
-         return super.getTooltipInfo(element);
++        return true;
 +    }
  }