fixes #3246 and a scrollbar issue in Safari

svn changeset:8661/svn branch:6.1

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 325f9bd3c2479c9de299a6266e8443bfe9bb6e07..6f66aed047d8fbd44666ad9ffa8da713c2a86472 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2732,7 +2732,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
             int availW = scrollBody.getAvailableWidth();
             // Hey IE, are you really sure about this?
             availW = scrollBody.getAvailableWidth();
-            availW -= scrollBody.getCellExtraWidth() * visibleColOrder.length;
+            int visibleCellCount = tHead.getVisibleCellCount();
+            availW -= scrollBody.getCellExtraWidth() * visibleCellCount;
             if (willHaveScrollbars()) {
                 availW -= Util.getNativeScrollbarSize();
             }
@@ -2771,8 +2772,12 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
                 }
                 colIndex++;
             }
-            Util.runWebkitOverflowAutoFix(bodyContainer.getElement());
             scrollBody.reLayoutComponents();
+            DeferredCommand.addCommand(new Command() {
+                public void execute() {
+                    Util.runWebkitOverflowAutoFix(bodyContainer.getElement());
+                }
+            });
         }
     };