summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAutomerge <automerge@vaadin.com>2012-05-29 13:09:19 +0000
committerAutomerge <automerge@vaadin.com>2012-05-29 13:09:19 +0000
commitbc630f6f294a24f5224c053634aa0ec3a6ccc7d5 (patch)
tree8b4ba732ea7667f8c9c708c5be6de27acc969310 /src/com
parent16554478a54c556bc11f1c7f43800c69685772ca (diff)
downloadvaadin-framework-bc630f6f294a24f5224c053634aa0ec3a6ccc7d5.tar.gz
vaadin-framework-bc630f6f294a24f5224c053634aa0ec3a6ccc7d5.zip
[merge from 6.7] Revert last attempt of fix for (#6039) as it doesn't fix all problems
svn changeset:23839/svn branch:6.8
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index c5ca16925b..9bfd013603 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2118,9 +2118,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
return true;
}
} else {
- if (scrollBody == null) {
- return false;
- }
int fakeheight = (int) Math.round(scrollBody.getRowHeight()
* totalRows);
int availableHeight = scrollBodyPanel.getElement().getPropertyInt(
@@ -6239,15 +6236,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
@Override
public void setHeight(String height) {
- boolean hadScrollbars = willHaveScrollbars();
this.height = height;
super.setHeight(height);
setContainerHeight();
- if (hadScrollbars != willHaveScrollbars()) {
- triggerLazyColumnAdjustment(true);
- }
-
if (initializedAndAttached) {
updatePageLength();
}