summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Alhroos <john.ahlroos@itmill.com>2010-05-20 13:13:17 +0000
committerJohn Alhroos <john.ahlroos@itmill.com>2010-05-20 13:13:17 +0000
commit2169caade8622d5c3feb712f77e46b0d188bc9d0 (patch)
tree530451f780ba5d7f4ae0ca33766b8d45bcf81834
parent33f26d680bf8fd686cb2c47656fea6bc641a1565 (diff)
downloadvaadin-framework-2169caade8622d5c3feb712f77e46b0d188bc9d0.tar.gz
vaadin-framework-2169caade8622d5c3feb712f77e46b0d188bc9d0.zip
Fix for #5022
svn changeset:13280/svn branch:6.3
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java6
1 files changed, 3 insertions, 3 deletions
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;
}