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 06943d6765c94f4f6b2054b0ad2af27a5ac8a936..ba961e436e609e84c5e763d239e799a759311013 100644 (file)
--- 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;\r
         }\r
 \r
-        ApplicationConnection.getConsole().log(\r
-                "Layout size: " + activeLayoutSize);\r
+        // ApplicationConnection.getConsole().log(\r
+        // "Layout size: " + activeLayoutSize);\r
         return remainingSpace;\r
     }\r
 \r
@@ -642,8 +642,10 @@ public class IOrderedLayout extends CellBasedLayout {
     public void setHeight(String height) {\r
         super.setHeight(height);\r
 \r
-        activeLayoutSize.setHeight(getOffsetHeight()\r
-                - activeMargins.getVertical());\r
+        if (height != null && !height.equals("")) {\r
+            activeLayoutSize.setHeight(getOffsetHeight()\r
+                    - activeMargins.getVertical());\r
+        }\r
 \r
         if (!isRendering) {\r
             if (recalculateLayoutAndComponentSizes()) {\r
@@ -658,8 +660,10 @@ public class IOrderedLayout extends CellBasedLayout {
         super.setWidth(width);\r
         this.width = width;\r
 \r
-        activeLayoutSize.setWidth(getOffsetWidth()\r
-                - activeMargins.getHorizontal());\r
+        if (width != null && !width.equals("")) {\r
+            activeLayoutSize.setWidth(getOffsetWidth()\r
+                    - activeMargins.getHorizontal());\r
+        }\r
 \r
         if (!isRendering) {\r
             if (recalculateLayoutAndComponentSizes()) {\r

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 84b20c1dfd7fa5a82cc03a0e637ac2810d07c1ee..0fbe91f4e3a6b9e4a46c7a4827b1fe1380e00aee 100644 (file)
--- 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();\r
         int h = widget.getOffsetHeight();\r
 \r
+//        ApplicationConnection.getConsole().log(\r
+//               Util.getSimpleName(widget) + " size is " + w + "," + h);\r
         widgetSize.setHeight(h);\r
         widgetSize.setWidth(w);\r
     }\r
@@ -619,9 +621,9 @@ public class ChildComponentContainer extends Panel {
         int containerHeight = widgetAndCaptionHeight;\r
         containerHeight += containerExpansion.getHeight();\r
 \r
-        ApplicationConnection.getConsole().log(\r
-                "Setting container size for " + Util.getSimpleName(widget)\r
-                        + " to " + containerWidth + "," + containerHeight);\r
+        // ApplicationConnection.getConsole().log(\r
+        // "Setting container size for " + Util.getSimpleName(widget)\r
+        // + " to " + containerWidth + "," + containerHeight);\r
 \r
         if (containerWidth < 0) {\r
             ApplicationConnection.getConsole().error(\r