Fixed the 'bouncing columns' issue introduced in the fix for #5066

svn changeset:16222/svn branch:6.5

2 files changed, 8 insertions, 7 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index df31ca9351..f743e8d7c6 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -895,6 +895,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
         setProperTabIndex();
 
+        // Force recalculation of the captionContainer element inside the header
+        // cell to accomodate for the size of the sort arrow.
+        HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn);
+        if (sortedHeader != null) {
+            sortedHeader.setWidth(sortedHeader.getWidth(),
+                    sortedHeader.isDefinedWidth());
+        }
+
         rendering = false;
         headerChangedDuringUpdate = false;
 
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 3932d25874..56662112e3 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -390,8 +390,6 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private MultiSelectMode multiSelectMode = MultiSelectMode.DEFAULT;
 
-    private boolean recalculateAllColumnWidths = false;
-
     /* Table constructors */
 
     /**
@@ -2054,7 +2052,6 @@ public class Table extends AbstractSelect implements Action.Container,
                 }
             }
             if (doSort) {
-                recalculateAllColumnWidths = true;
                 this.sort();
                 resetPageBuffer();
             }
@@ -2288,10 +2285,6 @@ public class Table extends AbstractSelect implements Action.Container,
                 target.addAttribute("recalcWidths", true);
             }
         }
-        if (recalculateAllColumnWidths) {
-            target.addAttribute("recalcWidths", true);
-            recalculateAllColumnWidths = false;
-        }
 
         if (!isNullSelectionAllowed() && getNullSelectionItemId() != null
                 && containsId(getNullSelectionItemId())) {