From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 18 Nov 2009 09:17:57 +0000 (+0000)
Subject: fixes #3724, fixed size change propagation
X-Git-Tag: 6.7.0.beta1~2285
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6edbe4d87b1e226a3520a3b24c9b77c6413f7fc0;p=vaadin-framework.git

fixes #3724, fixed size change propagation


svn changeset:9859/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
index 813901a564..ebd201724b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
@@ -239,14 +239,17 @@ public class VCssLayout extends SimplePanel implements Paintable, Container {
 
     public boolean requestLayout(Set<Paintable> children) {
         if (hasSize()) {
-            return false;
-        } else {
             return true;
+        } else {
+            // Size may have changed
+            // TODO optimize this: cache size if not fixed, handle both width
+            // and height separately
+            return false;
         }
     }
 
     private boolean hasSize() {
-        return hasWidth || hasHeight;
+        return hasWidth && hasHeight;
     }
 
     private static final String makeCamelCase(String cssProperty) {