Merged fix for #3701 - "Caption causes occasional clipping in Firefox"

svn changeset:9755/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index de40940ad27da0e4c2eb0657027eb1f3b4c86820..5a6306b79b0ad89ca45a43a1f1a0f68cd838dc34 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -343,26 +343,26 @@ public class VCaption extends HTML {
         int h;
 
         if (icon != null) {
-            h = icon.getOffsetHeight();
+            h = Util.getRequiredHeight(icon.getElement());
             if (h > height) {
                 height = h;
             }
         }
 
         if (captionText != null) {
-            h = captionText.getOffsetHeight();
+            h = Util.getRequiredHeight(captionText);
             if (h > height) {
                 height = h;
             }
         }
         if (requiredFieldIndicator != null) {
-            h = requiredFieldIndicator.getOffsetHeight();
+            h = Util.getRequiredHeight(requiredFieldIndicator);
             if (h > height) {
                 height = h;
             }
         }
         if (errorIndicatorElement != null) {
-            h = errorIndicatorElement.getOffsetHeight();
+            h = Util.getRequiredHeight(errorIndicatorElement);
             if (h > height) {
                 height = h;
             }