Fixed OrderedLayout margin handling

svn changeset:5772/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
index 1012bf686218ab2417ee8f8d25c6c98a077a4c46..a362e0ac6989974041ee75f040f53c2f7abaaf6f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -173,29 +173,25 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
 \r
     }\r
 \r
-    private void updateMargins(MarginInfo newMargins) {\r
-        if (newMargins.equals(activeMarginsInfo)) {\r
-            return;\r
-        }\r
-\r
+    private void updateMargins(MarginInfo newMarginInfo) {\r
         // Update active margins\r
-        activeMarginsInfo = newMargins;\r
-        if (newMargins.hasTop()) {\r
+        activeMarginsInfo = newMarginInfo;\r
+        if (newMarginInfo.hasTop()) {\r
             activeMargins.setMarginTop(marginsFromCSS.getMarginTop());\r
         } else {\r
             activeMargins.setMarginTop(0);\r
         }\r
-        if (newMargins.hasBottom()) {\r
+        if (newMarginInfo.hasBottom()) {\r
             activeMargins.setMarginBottom(marginsFromCSS.getMarginBottom());\r
         } else {\r
             activeMargins.setMarginBottom(0);\r
         }\r
-        if (newMargins.hasLeft()) {\r
+        if (newMarginInfo.hasLeft()) {\r
             activeMargins.setMarginLeft(marginsFromCSS.getMarginLeft());\r
         } else {\r
             activeMargins.setMarginLeft(0);\r
         }\r
-        if (newMargins.hasRight()) {\r
+        if (newMarginInfo.hasRight()) {\r
             activeMargins.setMarginRight(marginsFromCSS.getMarginRight());\r
         } else {\r
             activeMargins.setMarginRight(0);\r
@@ -211,7 +207,7 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
         DOM.setStyleAttribute(root, "marginBottom", activeMargins\r
                 .getMarginBottom()\r
                 + "px");\r
-\r
+                \r
     }\r
 \r
     protected boolean measureMarginsAndSpacing(String styleName,\r
@@ -252,6 +248,7 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
 \r
         root.removeChild(measurement);\r
 \r
+        updateMargins(activeMarginsInfo);\r
         return true;\r
     }\r
 \r