Use the correct window height when comparing to browser window height (#19590)

Change-Id: I41eb04330c20fcb6833c15ea7575947581e9fb57

3 files changed, 93 insertions, 8 deletions

diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index 9ea3c8bb68..8ddf099e28 100644
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -216,6 +216,17 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector
     public void layout() {
         LayoutManager lm = getLayoutManager();
         VWindow window = getWidget();
+
+        // ensure window is not larger than browser window
+        if (window.getOffsetWidth() > Window.getClientWidth()) {
+            window.setWidth(Window.getClientWidth() + "px");
+            lm.setNeedsMeasure(getContent());
+        }
+        if (window.getOffsetHeight() > Window.getClientHeight()) {
+            window.setHeight(Window.getClientHeight() + "px");
+            lm.setNeedsMeasure(getContent());
+        }
+
         ComponentConnector content = getContent();
         boolean hasContent = (content != null);
         Element contentElement = window.contentPanel.getElement();
@@ -414,14 +425,6 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector
             });
         }
         window.setVisible(true);
-
-        // ensure window is not larger than browser window
-        if (window.getOffsetWidth() > Window.getClientWidth()) {
-            window.setWidth(Window.getClientWidth() + "px");
-        }
-        if (window.getOffsetHeight() > Window.getClientHeight()) {
-            window.setHeight(Window.getClientHeight() + "px");
-        }
     }
 
     // Need to override default because of window mode
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaxHeight.java b/uitest/src/com/vaadin/tests/components/window/WindowMaxHeight.java
new file mode 100644
index 0000000000..430f99a6ac
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMaxHeight.java
@@ -0,0 +1,46 @@
+package com.vaadin.tests.components.window;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+@Theme("valo")
+public class WindowMaxHeight extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        WindowNotFullHeight window = new WindowNotFullHeight();
+        addWindow(window);
+        window.focus();
+    }
+
+    class WindowNotFullHeight extends Window {
+
+        public WindowNotFullHeight() {
+            setCaption("Should be 200px high");
+            setWidth(200, Unit.PIXELS);
+
+            VerticalLayout layoutRoot = new VerticalLayout();
+
+            Panel container = new Panel();
+            container.setHeight(200, Unit.PIXELS);
+
+            VerticalLayout containerContent = new VerticalLayout();
+            for (int i = 0; i < 300; i++) {
+                Panel hello = new Panel("hello");
+                containerContent.addComponent(hello);
+            }
+
+            container.setContent(containerContent);
+            layoutRoot.addComponent(container);
+            setContent(layoutRoot);
+
+        }
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaxHeightTest.java b/uitest/src/com/vaadin/tests/components/window/WindowMaxHeightTest.java
new file mode 100644
index 0000000000..dabc070d77
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMaxHeightTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.window;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Dimension;
+
+import com.vaadin.testbench.elements.WindowElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class WindowMaxHeightTest extends SingleBrowserTest {
+
+    @Test
+    public void ensureWindowNotFullHeight() {
+        openTestURL();
+        WindowElement window = $(WindowElement.class).first();
+        Dimension size = window.getSize();
+        Assert.assertTrue(
+                "Window should be 200-250px high, was " + size.getHeight(),
+                size.getHeight() < 250);
+    }
+}