]> source.dussan.org Git - vaadin-framework.git/commitdiff
Reverted some changes made in [13280] which was not relevant to the fix for #5022.
authorJohn Alhroos <john.ahlroos@itmill.com>
Thu, 20 May 2010 13:18:14 +0000 (13:18 +0000)
committerJohn Alhroos <john.ahlroos@itmill.com>
Thu, 20 May 2010 13:18:14 +0000 (13:18 +0000)
svn changeset:13281/svn branch:6.3

src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

index 9f5c1b3fac667f781ad827d20d2f8e0fcce0e660..83bf043d98a12335b7e32f991db1d6ca6d03c87b 100644 (file)
@@ -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;
             }