summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-11-27 06:52:34 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-27 06:52:34 +0000
commit7d3cf8f4ecfdb721f14f7dbba7a683d75fd8602a (patch)
tree2b1be1244e318b6c5df63b8562fefa2efb951dbd /client
parent7d1597b15802e45cc0b723b7af7753dc3866dca9 (diff)
parent515c3993e81025515aefe1af18a5a9bf80ce5686 (diff)
downloadvaadin-framework-7d3cf8f4ecfdb721f14f7dbba7a683d75fd8602a.tar.gz
vaadin-framework-7d3cf8f4ecfdb721f14f7dbba7a683d75fd8602a.zip
Merge "Fix resize of a Window with a single component (#10375)"
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VWindow.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 0885077111..1b35b020f2 100644
--- 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);