From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 30 Oct 2008 12:20:54 +0000 (+0000)
Subject: Fixed orderedlayout dynamic size calculations.
X-Git-Tag: 6.7.0.beta1~3897
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=97f53e9b90f9043ad0f3336a1d2ac74b5f7b9fac;p=vaadin-framework.git

Fixed orderedlayout dynamic size calculations.
Removed some debug info.

svn changeset:5769/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index 06943d6765..ba961e436e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -340,8 +340,8 @@ public class IOrderedLayout extends CellBasedLayout {
             remainingSpace = 0;
         }
 
-        ApplicationConnection.getConsole().log(
-                "Layout size: " + activeLayoutSize);
+        // ApplicationConnection.getConsole().log(
+        // "Layout size: " + activeLayoutSize);
         return remainingSpace;
     }
 
@@ -642,8 +642,10 @@ public class IOrderedLayout extends CellBasedLayout {
     public void setHeight(String height) {
         super.setHeight(height);
 
-        activeLayoutSize.setHeight(getOffsetHeight()
-                - activeMargins.getVertical());
+        if (height != null && !height.equals("")) {
+            activeLayoutSize.setHeight(getOffsetHeight()
+                    - activeMargins.getVertical());
+        }
 
         if (!isRendering) {
             if (recalculateLayoutAndComponentSizes()) {
@@ -658,8 +660,10 @@ public class IOrderedLayout extends CellBasedLayout {
         super.setWidth(width);
         this.width = width;
 
-        activeLayoutSize.setWidth(getOffsetWidth()
-                - activeMargins.getHorizontal());
+        if (width != null && !width.equals("")) {
+            activeLayoutSize.setWidth(getOffsetWidth()
+                    - activeMargins.getHorizontal());
+        }
 
         if (!isRendering) {
             if (recalculateLayoutAndComponentSizes()) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index 84b20c1dfd..0fbe91f4e3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -163,6 +163,8 @@ public class ChildComponentContainer extends Panel {
         int w = widget.getOffsetWidth();
         int h = widget.getOffsetHeight();
 
+//        ApplicationConnection.getConsole().log(
+//               Util.getSimpleName(widget) + " size is " + w + "," + h);
         widgetSize.setHeight(h);
         widgetSize.setWidth(w);
     }
@@ -619,9 +621,9 @@ public class ChildComponentContainer extends Panel {
         int containerHeight = widgetAndCaptionHeight;
         containerHeight += containerExpansion.getHeight();
 
-        ApplicationConnection.getConsole().log(
-                "Setting container size for " + Util.getSimpleName(widget)
-                        + " to " + containerWidth + "," + containerHeight);
+        // ApplicationConnection.getConsole().log(
+        // "Setting container size for " + Util.getSimpleName(widget)
+        // + " to " + containerWidth + "," + containerHeight);
 
         if (containerWidth < 0) {
             ApplicationConnection.getConsole().error(