scrolltable theme refactoring: cleaning, fixing regressions

svn changeset:7523/svn branch:6.0

1 files changed, 12 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 2f88424374..70bcc618a5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -15,6 +15,7 @@ import java.util.Vector;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.TableCellElement;
 import com.google.gwt.dom.client.TableRowElement;
 import com.google.gwt.dom.client.TableSectionElement;
@@ -603,8 +604,10 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
         }
 
         int availW = tBody.getAvailableWidth();
-        // Hey IE, are you really sure about this?
-        availW = tBody.getAvailableWidth();
+        if (BrowserInfo.get().isIE()) {
+            // Hey IE, are you really sure about this?
+            availW = tBody.getAvailableWidth();
+        }
         availW -= tBody.getCellExtraWidth() * visibleColOrder.length;
 
         if (willHaveScrollbarz) {
@@ -689,6 +692,7 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
                  */
                 int bodyHeight = tBody.getTableHeight();
                 bodyContainer.setHeight(bodyHeight + "px");
+                Util.runWebkitOverflowAutoFix(bodyContainer.getElement());
             } else {
                 int bodyHeight = (tBody.getRowHeight(true) * pageLength);
                 bodyContainer.setHeight(bodyHeight + "px");
@@ -726,16 +730,6 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
         initializedAndAttached = true;
     }
 
-    private int getScrollbarWidth() {
-        if (BrowserInfo.get().isIE6()) {
-            return Util.measureHorizontalBorder(bodyContainer.getElement());
-        }
-
-        return bodyContainer.getOffsetWidth()
-                - DOM.getElementPropertyInt(bodyContainer.getElement(),
-                        "clientWidth");
-    }
-
     /**
      * This method has logic which rows needs to be requested from server when
      * user scrolls
@@ -1844,7 +1838,12 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
         }
 
         public int getAvailableWidth() {
-            return preSpacer.getOffsetWidth();
+            Style style = bodyContainer.getElement().getStyle();
+            style.setProperty("overflow", "hidden");
+            int w = bodyContainer.getElement().getPropertyInt("clientWidth");
+            style.setProperty("overflow", "auto");
+            return w;
+            // return preSpacer.getOffsetWidth();
         }
 
         public void renderInitialRows(UIDL rowData, int firstIndex, int rows) {