diff options
author | Automerge <automerge@vaadin.com> | 2012-06-01 09:07:29 +0000 |
---|---|---|
committer | Automerge <automerge@vaadin.com> | 2012-06-01 09:07:29 +0000 |
commit | d1b21ae7f7a52542ee56a150a5495bf52b1d0b25 (patch) | |
tree | 626300b34867773a1a2786b1efa9a282f075dc30 /src | |
parent | 6f729f5d55cdfb719e8de835d4c713225bfd7ef2 (diff) | |
download | vaadin-framework-d1b21ae7f7a52542ee56a150a5495bf52b1d0b25.tar.gz vaadin-framework-d1b21ae7f7a52542ee56a150a5495bf52b1d0b25.zip |
[merge from 6.7] Made tooltips work for Slider (#8863)
svn changeset:23873/svn branch:6.8
Diffstat (limited to 'src')
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VSlider.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java index e605c6fe12..84a7284944 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java @@ -20,6 +20,7 @@ import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VConsole; +import com.vaadin.terminal.gwt.client.VTooltip; public class VSlider extends SimpleFocusablePanel implements Paintable, Field, ContainerResizedListener { @@ -113,6 +114,8 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, feedbackPopup.addStyleName(CLASSNAME + "-feedback"); feedbackPopup.setWidget(feedback); + + sinkEvents(VTooltip.TOOLTIP_EVENTS); } public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { @@ -369,6 +372,9 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, event.preventDefault(); // avoid simulated events event.stopPropagation(); } + if (client != null) { + client.handleTooltipEvent(event, this); + } } private void processMouseWheelEvent(final Event event) { |