From: John Alhroos <john.ahlroos@itmill.com>
Date: Thu, 20 May 2010 13:13:17 +0000 (+0000)
Subject: Fix for #5022
X-Git-Tag: 6.7.0.beta1~1656^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2169caade8622d5c3feb712f77e46b0d188bc9d0;p=vaadin-framework.git

Fix for #5022

svn changeset:13280/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 f62da54ff1..9f5c1b3fac 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1393,7 +1393,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
     public class TableHead extends Panel implements ActionOwner {
 
-        private static final int WRAPPER_WIDTH = 9000;
+        private static final int WRAPPER_WIDTH = 900000;
 
         ArrayList<Widget> visibleCells = new ArrayList<Widget>();
 
@@ -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();
+            // contentH -= showColHeaders ? tHead.getOffsetHeight() : 0;
+            contentH -= getContentAreaBorderHeight() + tHead.getOffsetHeight();
             if (contentH < 0) {
                 contentH = 0;
             }