Reverted [16223]

svn changeset:16234/svn branch:6.5

1 files changed, 23 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
index 7c8555ff77..d585cf8eb7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -126,6 +126,8 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
         if (client.updateComponent(this, uidl, true)) {
             return;
         }
+
+        handleDynamicDimensions(uidl);
     }
 
     @Override
@@ -156,6 +158,27 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
         }
     }
 
+    private void handleDynamicDimensions(UIDL uidl) {
+        String w = uidl.hasAttribute("width") ? uidl
+                .getStringAttribute("width") : "";
+
+        String h = uidl.hasAttribute("height") ? uidl
+                .getStringAttribute("height") : "";
+
+        if (w.equals("")) {
+            dynamicWidth = true;
+        } else {
+            dynamicWidth = false;
+        }
+
+        if (h.equals("")) {
+            dynamicHeight = true;
+        } else {
+            dynamicHeight = false;
+        }
+
+    }
+
     @Override
     public void setHeight(String height) {
         super.setHeight(height);