Merged from 6.1: Allow events trough to the debug window, even if a modal window is being shown. Fixes #3094

svn changeset:9200/svn branch:6.2

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 5cb93795b3..4957ce2b2d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -22,11 +22,13 @@ import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Console;
 import com.vaadin.terminal.gwt.client.Container;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.RenderSpace;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.VDebugConsole;
 
 /**
  * "Sub window" component.
@@ -909,7 +911,16 @@ public class VWindow extends VOverlay implements Container, ScrollListener {
         } else if (vaadinModality) {
             // return false when modal and outside window
             final Element target = event.getTarget().cast();
+
             if (!DOM.isOrHasChild(getElement(), target)) {
+                // not within the modal window, but let's see if it's in the
+                // debug window
+                Console console = ApplicationConnection.getConsole();
+                if (console instanceof VDebugConsole
+                        && DOM.isOrHasChild(((VDebugConsole) console)
+                                .getElement(), target)) {
+                    return true; // allow debug-window clicks
+                }
                 return false;
             }
         }