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 e4d8a68daaec526efb19f22729d61557f48dc4ee..6e9205ca8a4aecc46a5663acff6e28c417744631 100644 (file)
--- 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 67db443cc90625f5f0e2ea6b056e7d9ee7e4f442..39ffc1e6301014254794c93f5ca37fc6343a5df1 100644 (file)
--- 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 8f489ab9ef265c62c7ce63a27c0c127994eb073b..b4c2f862ef32a31aa8dd9e4567f5cfd97f9d2f32 100644 (file)
--- 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();