]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fix for #3854 - SplitterClickListener doesn't work properly when SplitPanel is locked.
authorArtur Signell <artur.signell@itmill.com>
Fri, 15 Jan 2010 15:10:33 +0000 (15:10 +0000)
committerArtur Signell <artur.signell@itmill.com>
Fri, 15 Jan 2010 15:10:33 +0000 (15:10 +0000)
svn changeset:10756/svn branch:6.2

src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java

index 31fb16368976fb762a62a4a2e1adf8c584316589..87f2ff7478749884cbc8aab36ac4274944a9402f 100644 (file)
@@ -40,7 +40,14 @@ public class VSplitPanel extends ComplexPanel implements Container,
         @Override
         protected <H extends EventHandler> HandlerRegistration registerHandler(
                 H handler, Type<H> type) {
-            return addDomHandler(handler, type);
+            if ((Event.getEventsSunk(splitter) & Event.getTypeInt(type
+                    .getName())) != 0) {
+                // If we are already sinking the event for the splitter we do
+                // not want to additionally sink it for the root element
+                return addHandler(handler, type);
+            } else {
+                return addDomHandler(handler, type);
+            }
         }
 
         @Override
@@ -138,7 +145,6 @@ public class VSplitPanel extends ComplexPanel implements Container,
         constructDom();
         setOrientation(orientation);
         DOM.sinkEvents(splitter, (Event.MOUSEEVENTS));
-        DOM.sinkEvents(getElement(), (Event.MOUSEEVENTS));
     }
 
     protected void constructDom() {