From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 22 Sep 2008 10:28:28 +0000 (+0000)
Subject: Fixes #1966 in IE6/IE7
X-Git-Tag: 6.7.0.beta1~4122
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2cfd5a87ae110ed336841961b894f98c40efce28;p=vaadin-framework.git

Fixes #1966 in IE6/IE7

svn changeset:5478/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 48b01c51d5..8c5daf4551 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -1202,10 +1202,17 @@ public class IOrderedLayout extends Panel implements Container,
                     }
 
                     // Construct table structure to align children
-                    final String t = "<table cellpadding='0' cellspacing='0' width='100%' height='100%'><tbody><tr><td>"
+                    String alignmentTableStructure = "<table cellpadding='0' cellspacing='0' width='100%'";
+                    if (BrowserInfo.get().isIE()) {
+                        alignmentTableStructure += " style='height: expression(this.parentElement.offsetHeight+\"px\")'";
+                    } else {
+                        alignmentTableStructure += " height='100%'";
+                    }
+                    alignmentTableStructure += "><tbody><tr><td>"
                             + "<table cellpadding='0' cellspacing='0' ><tbody><tr><td align='left'>"
                             + "</td></tr></tbody></table></td></tr></tbody></table>";
-                    DOM.setInnerHTML(getElementWrappingWidgetAndCaption(), t);
+                    DOM.setInnerHTML(getElementWrappingWidgetAndCaption(),
+                            alignmentTableStructure);
                     alignmentTD = DOM
                             .getFirstChild(DOM
                                     .getFirstChild(DOM
@@ -1243,7 +1250,7 @@ public class IOrderedLayout extends Panel implements Container,
                 // Set the alignment in td
                 DOM.setElementAttribute(alignmentTD, "align",
                         horizontalAlignment);
-                DOM.setElementAttribute(alignmentTD, "valign",
+                DOM.setElementAttribute(alignmentTD, "vAlign",
                         verticalAlignment);
 
             } else {