From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 26 Feb 2008 07:13:43 +0000 (+0000)
Subject: #1345, #1444 Caption size sometimes broken in IE6 too.
X-Git-Tag: 6.7.0.beta1~5020
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=696575248152f1e5f4b618c3bad6463af94f3b18;p=vaadin-framework.git

#1345, #1444 Caption size sometimes broken in IE6 too.

svn changeset:3922/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
index 36de42b338..e92fb7ba82 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
@@ -100,12 +100,18 @@ public class Caption extends HTML {
                 setTitle(uidl.getStringAttribute("description"));
             }
         }
-        // Workaround for IE7 weirdness, returns bad height in some
+        // Workaround for IE weirdness, sometimes returns bad height in some
         // circumstances when Caption is empty. See #1444
-        // IE6 works perfectly without them. I wonder what happens when
-        // IE8 arrives...
-        if (isEmpty && Util.isIE7()) {
-            setHeight("0px");
+        // IE7 bugs more often. I wonder what happens when IE8 arrives...
+        if (Util.isIE()) {
+            if (isEmpty) {
+                setHeight("0px");
+                DOM.setStyleAttribute(getElement(), "overflow", "hidden");
+            } else {
+                setHeight("");
+                DOM.setStyleAttribute(getElement(), "overflow", "");
+            }
+
         }
 
     }