From: John Alhroos <john.ahlroos@itmill.com>
Date: Thu, 20 May 2010 13:18:14 +0000 (+0000)
Subject: Reverted some changes made in [13280] which was not relevant to the fix for #5022.
X-Git-Tag: 6.7.0.beta1~1656^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=211358bd93db47a63b74cab37e16e557ff363270;p=vaadin-framework.git

Reverted some changes made in [13280] which was not relevant to the fix for #5022.

svn changeset:13281/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 9f5c1b3fac..83bf043d98 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2969,8 +2969,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
     private void setContainerHeight() {
         if (height != null && !"".equals(height)) {
             int contentH = getOffsetHeight();
-            // contentH -= showColHeaders ? tHead.getOffsetHeight() : 0;
-            contentH -= getContentAreaBorderHeight() + tHead.getOffsetHeight();
+            contentH -= showColHeaders ? tHead.getOffsetHeight() : 0;
+            contentH -= getContentAreaBorderHeight();
             if (contentH < 0) {
                 contentH = 0;
             }