Fix for #6142

svn changeset:16476/svn branch:6.5

src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

@@ -715,6 +715,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         nullSelectionAllowed = uidl.hasAttribute("nsa") ? uidl
                 .getBooleanAttribute("nsa") : true;
 
+        String oldSortColumn = sortColumn;
         if (uidl.hasVariable("sortascending")) {
             sortAscending = uidl.getBooleanVariable("sortascending");
             sortColumn = uidl.getStringVariable("sortcolumn");
@@ -902,6 +903,13 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             sortedHeader.setWidth(sortedHeader.getWidth(),
                     sortedHeader.isDefinedWidth());
         }
+        // Also recalculate the width of the captionContainer element in the
+        // previously sorted header, since this now has more room.
+        HeaderCell oldSortedHeader = tHead.getHeaderCell(oldSortColumn);
+        if (oldSortedHeader != null) {
+            oldSortedHeader.setWidth(oldSortedHeader.getWidth(),
+                    oldSortedHeader.isDefinedWidth());
+        }
 
         rendering = false;
         headerChangedDuringUpdate = false;