Fix resize of a Window with a single component (#10375)

Change-Id: I04d2d39b61ee5fb841511dd23d6f674089cff916

diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 08850771111bf742770a88609f4604235809db8f..1b35b020f2914f298db5e48ccead1f2d7025c91c 100644 (file)
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -744,8 +744,11 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
     private void updateContentsSize() {
         // Update child widget dimensions
         if (client != null) {
-            client.handleComponentRelativeSize(layout.getWidget());
-            client.runDescendentsLayout((HasWidgets) layout.getWidget());
+            Widget childWidget = layout.getWidget();
+            client.handleComponentRelativeSize(childWidget);
+            if (childWidget instanceof HasWidgets) {
+                client.runDescendentsLayout((HasWidgets) childWidget);
+            }
         }
 
         LayoutManager layoutManager = LayoutManager.get(client);

diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowWithLabel.java b/uitest/src/com/vaadin/tests/components/ui/WindowWithLabel.java
new file mode 100644 (file)
index 0000000..994c069
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/WindowWithLabel.java
@@ -0,0 +1,27 @@
+package com.vaadin.tests.components.ui;\r
+\r
+import com.vaadin.server.VaadinRequest;\r
+import com.vaadin.tests.components.AbstractTestUI;\r
+import com.vaadin.ui.Label;\r
+import com.vaadin.ui.Window;\r
+\r
+public class WindowWithLabel extends AbstractTestUI {\r
+\r
+    @Override\r
+    protected void setup(VaadinRequest request) {\r
+        setContent(new Label("UI"));\r
+        Window window = new Window("A window");\r
+        addWindow(window);\r
+    }\r
+\r
+    @Override\r
+    protected String getTestDescription() {\r
+        return "Resize the window. It should work.";\r
+    }\r
+\r
+    @Override\r
+    protected Integer getTicketNumber() {\r
+        return 10375;\r
+    }\r
+\r
+}\r