From c53e5762f23f7d2c8300f7f147b2f19a2c8e708e Mon Sep 17 00:00:00 2001
From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Fri, 4 Jul 2008 09:28:43 +0000
Subject: [PATCH] Fixes #1908 : changing layout alignment changes controls
 orientation to vertical

svn changeset:5057/svn branch:trunk
---
 .../gwt/client/ui/IOrderedLayout.java         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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 3e8604f569..38d6e84c47 100644
--- 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)) {
-- 
2.39.5