From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Tue, 22 Dec 2009 12:22:47 +0000 (+0000)
Subject: Fixes #3902: VWindow focus handling broken
X-Git-Tag: 6.7.0.beta1~2084^2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5b7158440e00811a225eb62d7da6a4639ef1dfa;p=vaadin-framework.git

Fixes #3902: VWindow focus handling broken

svn changeset:10523/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index e8a96c63fb..e1ab149dc5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -795,8 +795,8 @@ public class VWindow extends VOverlay implements Container, ScrollListener {
                 }
             }
 
-            if (type == Event.ONMOUSEDOWN) {
-                // !DOM.isOrHasChild(contentPanel.getElement(), target)
+            if (type == Event.ONMOUSEDOWN
+                    && !DOM.isOrHasChild(contentPanel.getElement(), target)) {
                 Util.focus(contentPanel.getElement());
             }
         }