From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 14 May 2010 08:05:08 +0000 (+0000)
Subject: merged bug fixes from 6.3 branch
X-Git-Tag: 6.7.0.beta1~1670
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f426a86829f1c233e01002ebdeb8a1d921ebc9f;p=vaadin-framework.git

merged bug fixes from 6.3 branch

svn changeset:13187/svn branch:6.4
---

6f426a86829f1c233e01002ebdeb8a1d921ebc9f
diff --cc src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index bd30bac739,f62da54ff1..9629ea4a95
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@@ -4266,8 -2968,8 +4267,9 @@@ public class VScrollTable extends FlowP
       */
      private void setContainerHeight() {
          if (height != null && !"".equals(height)) {
-             int contentH = getOffsetHeight() - tHead.getOffsetHeight()
-                     - tFoot.getOffsetHeight();
+             int contentH = getOffsetHeight();
+             contentH -= showColHeaders ? tHead.getOffsetHeight() : 0;
++            contentH -= tFoot.getOffsetHeight();
              contentH -= getContentAreaBorderHeight();
              if (contentH < 0) {
                  contentH = 0;