From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 30 Oct 2008 13:24:47 +0000 (+0000)
Subject: Fixed OrderedLayout margin handling
X-Git-Tag: 6.7.0.beta1~3894
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aaf2fffe3c10a3e00ebfb72d16ee9f74fbd20f24;p=vaadin-framework.git

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 1012bf6862..a362e0ac69 100644
--- 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
 
     }
 
-    private void updateMargins(MarginInfo newMargins) {
-        if (newMargins.equals(activeMarginsInfo)) {
-            return;
-        }
-
+    private void updateMargins(MarginInfo newMarginInfo) {
         // Update active margins
-        activeMarginsInfo = newMargins;
-        if (newMargins.hasTop()) {
+        activeMarginsInfo = newMarginInfo;
+        if (newMarginInfo.hasTop()) {
             activeMargins.setMarginTop(marginsFromCSS.getMarginTop());
         } else {
             activeMargins.setMarginTop(0);
         }
-        if (newMargins.hasBottom()) {
+        if (newMarginInfo.hasBottom()) {
             activeMargins.setMarginBottom(marginsFromCSS.getMarginBottom());
         } else {
             activeMargins.setMarginBottom(0);
         }
-        if (newMargins.hasLeft()) {
+        if (newMarginInfo.hasLeft()) {
             activeMargins.setMarginLeft(marginsFromCSS.getMarginLeft());
         } else {
             activeMargins.setMarginLeft(0);
         }
-        if (newMargins.hasRight()) {
+        if (newMarginInfo.hasRight()) {
             activeMargins.setMarginRight(marginsFromCSS.getMarginRight());
         } else {
             activeMargins.setMarginRight(0);
@@ -211,7 +207,7 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
         DOM.setStyleAttribute(root, "marginBottom", activeMargins
                 .getMarginBottom()
                 + "px");
-
+                
     }
 
     protected boolean measureMarginsAndSpacing(String styleName,
@@ -252,6 +248,7 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
 
         root.removeChild(measurement);
 
+        updateMargins(activeMarginsInfo);
         return true;
     }