From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 8 Dec 2008 13:32:12 +0000 (+0000)
Subject: Fix for #2288 - GridLayout vertical spacing detection broken in IE7
X-Git-Tag: 6.7.0.beta1~3639
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d6d3c709063147bf1cd46d7de5bee94ee3ee8472;p=vaadin-framework.git

Fix for #2288 - GridLayout vertical spacing detection broken in IE7

svn changeset:6119/svn branch:trunk
---

diff --git a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css b/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css
index e4d8a68daa..6e9205ca8a 100644
--- a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css
+++ b/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css
@@ -19,10 +19,12 @@
 .i-gridlayout-spacing-on {
 	padding-left:8px;
 	padding-top:8px;
+	overflow:hidden;
 }
 .i-gridlayout-spacing-off {
 	padding-left:0px;
 	padding-top:0px;
+	overflow:hidden;
 }
 
 .i-gridlayout-spacing,
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 67db443cc9..39ffc1e630 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -780,10 +780,12 @@ input.i-modified,
 .i-gridlayout-spacing-on {
 	padding-left:8px;
 	padding-top:8px;
+	overflow:hidden;
 }
 .i-gridlayout-spacing-off {
 	padding-left:0px;
 	padding-top:0px;
+	overflow:hidden;
 }
 
 .i-gridlayout-spacing,
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
index 8f489ab9ef..b4c2f862ef 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -582,6 +582,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container {
         spacingmeter.setClassName(CLASSNAME + "-" + "spacing-"
                 + (uidl.getBooleanAttribute("spacing") ? "on" : "off"));
         spacingmeter.getStyle().setProperty("width", "0");
+        spacingmeter.getStyle().setProperty("height", "0");
         canvas.getElement().appendChild(spacingmeter);
         spacingPixelsHorizontal = spacingmeter.getOffsetWidth();
         spacingPixelsVertical = spacingmeter.getOffsetHeight();