Merged: Fix for #3519 - Table height miscalculated in IE7

svn changeset:9174/svn branch:6.2

1 files changed, 13 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index e35d8993a4..8da166f1e5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2835,12 +2835,19 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
      */
     private int getContentAreaBorderHeight() {
         if (contentAreaBorderHeight < 0) {
-            DOM.setStyleAttribute(bodyContainer.getElement(), "overflow",
-                    "hidden");
-            contentAreaBorderHeight = bodyContainer.getOffsetHeight()
-                    - bodyContainer.getElement().getPropertyInt("clientHeight");
-            DOM.setStyleAttribute(bodyContainer.getElement(), "overflow",
-                    "auto");
+            if (BrowserInfo.get().isIE7()) {
+                contentAreaBorderHeight = Util
+                        .measureVerticalBorder(bodyContainer.getElement());
+            } else {
+                DOM.setStyleAttribute(bodyContainer.getElement(), "overflow",
+                        "hidden");
+                int oh = bodyContainer.getOffsetHeight();
+                int ch = bodyContainer.getElement().getPropertyInt(
+                        "clientHeight");
+                contentAreaBorderHeight = oh - ch;
+                DOM.setStyleAttribute(bodyContainer.getElement(), "overflow",
+                        "auto");
+            }
         }
         return contentAreaBorderHeight;
     }