Changeset 4842 for branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java

Timestamp:

06/10/08 10:07:06 (6 months ago)

Author:

magi@…

Message:

Merged [4827] from trunk to 5.2 branch: fixes #1091

Files:

• branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java (modified) (5 diffs)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java

@@ -158 +158 @@
         DOM.appendChild(footer, resizeBox);
 
-        DOM.sinkEvents(header, Event.MOUSEEVENTS);
-        DOM.sinkEvents(resizeBox, Event.MOUSEEVENTS);
         DOM.sinkEvents(getElement(), Event.ONLOSECAPTURE);
         DOM.sinkEvents(closeBox, Event.ONCLICK);
@@ -180 +178 @@
         DOM.appendChild(super.getContainerElement(), wrapper);
         DOM.setElementProperty(getElement(), "className", CLASSNAME);
+
+        sinkEvents(Event.MOUSEEVENTS);
 
         setWidget(contentPanel);
@@ -488 +488 @@
 
         final Element target = DOM.eventGetTarget(event);
-        if (dragging || DOM.isOrHasChild(header, target)) {
-            onHeaderEvent(event);
-            DOM.eventCancelBubble(event, true);
-        } else if (resizing || DOM.compare(resizeBox, target)) {
+        if (resizing || DOM.compare(resizeBox, target)) {
             onResizeEvent(event);
             DOM.eventCancelBubble(event, true);
-        } else if (DOM.compare(target, closeBox) && type == Event.ONCLICK) {
-            onCloseClick();
+        } else if (DOM.compare(target, closeBox)) {
+            if (type == Event.ONCLICK) {
+                onCloseClick();
+                DOM.eventCancelBubble(event, true);
+            }
+        } else if (dragging || !DOM.isOrHasChild(contents, target)) {
+            onDragEvent(event);
             DOM.eventCancelBubble(event, true);
-        } else {
+        } else if (type == Event.ONCLICK) {
             // clicked inside window, ensure to be on top
             if (!isActive()) {
@@ -577 +579 @@
     }
 
-    private void onHeaderEvent(Event event) {
+    private void onDragEvent(Event event) {
         switch (DOM.eventGetType(event)) {
         case Event.ONMOUSEDOWN:
@@ -616 +618 @@
     public boolean onEventPreview(Event event) {
         if (dragging) {
-            onHeaderEvent(event);
+            onDragEvent(event);
             return false;
         } else if (resizing) {