From 623628a1c0a579b9e1b7276a0475913e2e27d1cd Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Mon, 11 Jun 2012 07:49:11 +0000 Subject: Recalculate column widths after changing table height (#6039) Also fixes a rounding problem causing column width calculation to show scrollbars in IE9 under certain conditions. svn changeset:23928/svn branch:6.8 --- src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index d88d0d31e5..24097c0949 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -6120,7 +6120,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, && totalRows == pageLength) { // fix body height (may vary if lazy loading is offhorizontal // scrollbar appears/disappears) - int bodyHeight = scrollBody.getRequiredHeight(); + int bodyHeight = Util.getRequiredHeight(scrollBody); boolean needsSpaceForHorizontalScrollbar = (availW < usedMinimumWidth); if (needsSpaceForHorizontalScrollbar) { bodyHeight += Util.getNativeScrollbarSize(); @@ -6232,6 +6232,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, @Override public void setHeight(String height) { + if (height.equals(this.height)) { + return; + } this.height = height; super.setHeight(height); setContainerHeight(); @@ -6253,6 +6256,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, }); } + triggerLazyColumnAdjustment(false); + /* * setting height may affect wheter the component has scrollbars -> * needs scrolling or not -- cgit v1.2.3