iscrolltable fix for scrollbars on size change

svn changeset:7568/svn branch:6.0

1 files changed, 20 insertions, 13 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 596b47a191..96d10fa7c3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -578,19 +578,7 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
 
         tHead.disableBrowserIntelligence();
 
-        boolean willHaveScrollbarz = false;
-        if (!(height != null && !height.equals(""))) {
-            if (pageLength < totalRows) {
-                willHaveScrollbarz = true;
-            }
-        } else {
-            int fakeheight = tBody.getRowHeight() * totalRows;
-            int availableHeight = bodyContainer.getElement().getPropertyInt(
-                    "clientHeight");
-            if (fakeheight > availableHeight) {
-                willHaveScrollbarz = true;
-            }
-        }
+        boolean willHaveScrollbarz = willHaveScrollbars();
 
         // fix "natural" width if width not set
         if (width == null || "".equals(width)) {
@@ -731,6 +719,22 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
         initializedAndAttached = true;
     }
 
+    private boolean willHaveScrollbars() {
+        if (!(height != null && !height.equals(""))) {
+            if (pageLength < totalRows) {
+                return true;
+            }
+        } else {
+            int fakeheight = tBody.getRowHeight() * totalRows;
+            int availableHeight = bodyContainer.getElement().getPropertyInt(
+                    "clientHeight");
+            if (fakeheight > availableHeight) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * This method has logic which rows needs to be requested from server when
      * user scrolls
@@ -2708,6 +2712,9 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
             // Hey IE, are you really sure about this?
             availW = tBody.getAvailableWidth();
             availW -= tBody.getCellExtraWidth() * visibleColOrder.length;
+            if (willHaveScrollbars()) {
+                availW -= Util.getNativeScrollbarSize();
+            }
 
             int extraSpace = availW - usedMinimumWidth;
             if (extraSpace < 0) {