Fixes #1917 IOrderedLayout completely invisible in IE

svn changeset:5066/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 7da728c99cf13f4054e8c7b12b0e2642281ff799..34cc6fda408ade4f4d49fd27db85bd09c0ef608f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -128,7 +128,9 @@ public class IOrderedLayout extends Panel implements Container,
             DOM.setInnerHTML(root, structure);
             wrappedChildContainer = DOM.getFirstChild(DOM.getFirstChild(DOM
                     .getFirstChild(root)));
-            DOM.setStyleAttribute(root, "display", "table");
+            if (!BrowserInfo.get().isIE()) {
+                DOM.setStyleAttribute(root, "display", "table");
+            }
         } else {
             wrappedChildContainer = root;
             DOM.setInnerHTML(root, "");
@@ -559,7 +561,7 @@ public class IOrderedLayout extends Panel implements Container,
                 // Apply 'hasLayout' for IE (needed to get accurate dimension
                 // calculations)
                 if (BrowserInfo.get().isIE()) {
-                    DOM.setStyleAttribute(e, "zoom", "1");
+                    DOM.setStyleAttribute(getElement(), "zoom", "1");
                 }
             } else {
                 setElement(DOM.createTD());
@@ -644,22 +646,22 @@ public class IOrderedLayout extends Panel implements Container,
         void setAlignment(String verticalAlignment, String horizontalAlignment) {
 
             // Set vertical alignment
-            if (orientationMode == ORIENTATION_VERTICAL) {
-                if (verticalAlignment == null
-                        || verticalAlignment.equals("top")) {
-                    DOM.setStyleAttribute(getElement(), "display", "block");
-                    DOM.setStyleAttribute(getElement(), "width", "");
-                } else {
-                    DOM
-                            .setStyleAttribute(getElement(), "display",
-                                    "table-cell");
-                    DOM.setStyleAttribute(getElement(), "width", "1000000px");
-                }
-            }
             if (BrowserInfo.get().isIE()) {
                 DOM.setElementAttribute(getElement(), "vAlign",
                         verticalAlignment);
             } else {
+                if (orientationMode == ORIENTATION_VERTICAL) {
+                    if (verticalAlignment == null
+                            || verticalAlignment.equals("top")) {
+                        DOM.setStyleAttribute(getElement(), "display", "block");
+                        DOM.setStyleAttribute(getElement(), "width", "");
+                    } else {
+                        DOM.setStyleAttribute(getElement(), "display",
+                                "table-cell");
+                        DOM.setStyleAttribute(getElement(), "width",
+                                "1000000px");
+                    }
+                }
                 DOM.setStyleAttribute(getElement(), "verticalAlign",
                         verticalAlignment);
             }