From e7a6813f2efa93a4902ca043291b91b7afe62508 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Wed, 14 Oct 2009 13:20:43 +0000 Subject: [PATCH] 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 --- src/com/vaadin/terminal/gwt/client/ui/VWindow.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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; } } -- 2.39.5