Fixes #1908 : changing layout alignment changes controls orientation to vertical

svn changeset:5057/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 3e8604f5698720bc40c3bafb0746b382561f1ba8..38d6e84c4790e08b0dfb3e154cd1049d7f8418c7 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -204,15 +204,20 @@ public class IOrderedLayout extends Panel implements Container,
 
         this.client = client;
 
-        updateOrientation(uidl);
+        // Only non-cached UIDL:s can introduce changes
+        if (!uidl.getBooleanAttribute("cached")) {
 
-        // Handle layout margins
-        if (margins.getBitMask() != uidl.getIntAttribute("margins")) {
-            handleMargins(uidl);
-        }
+            // Swith between orientation modes if necessary
+            updateOrientation(uidl);
+
+            // Handle layout margins
+            if (margins.getBitMask() != uidl.getIntAttribute("margins")) {
+                handleMargins(uidl);
+            }
 
-        // Handle component spacing later in handleAlignments() method
-        hasComponentSpacing = uidl.getBooleanAttribute("spacing");
+            // Handle component spacing later in handleAlignments() method
+            hasComponentSpacing = uidl.getBooleanAttribute("spacing");
+        }
 
         // Update sizes, ...
         if (client.updateComponent(this, uidl, false)) {