diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2010-05-20 13:18:14 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2010-05-20 13:18:14 +0000 |
| commit | 211358bd93db47a63b74cab37e16e557ff363270 (patch) | |
| tree | 1eec524bc1b4931dce9240c733bfe5ee4b1b3905 | |
| parent | 2169caade8622d5c3feb712f77e46b0d188bc9d0 (diff) | |
| download | vaadin-framework-211358bd93db47a63b74cab37e16e557ff363270.tar.gz vaadin-framework-211358bd93db47a63b74cab37e16e557ff363270.zip | |
Reverted some changes made in [13280] which was not relevant to the fix for #5022.
svn changeset:13281/svn branch:6.3
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |