Fixed #7340 - rendering bug when first sorting a column

svn changeset:20046/svn branch:6.7

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 584ab024521a0c0adcf5505e1300dfc8bcc43d41..34362166602f13aef772c873234f91ed8f21516a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -383,6 +383,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
     private int firstvisible = 0;
     private boolean sortAscending;
     private String sortColumn;
+    private String oldSortColumn;
     private boolean columnReordering;
 
     /**
@@ -809,8 +810,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
         if (BrowserInfo.get().isIE8() && !enabled) {
             /*
-             * The disabled shim will not cover the table body if it is
-             * relative in IE8. See #7324
+             * The disabled shim will not cover the table body if it is relative
+             * in IE8. See #7324
              */
             scrollBodyPanel.getElement().getStyle()
                     .setPosition(Position.STATIC);
@@ -950,6 +951,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 .getIntAttribute("tabindex") : 0;
         setProperTabIndex();
 
+        resizeSortedColumnForSortIndicator();
+
         rendering = false;
         headerChangedDuringUpdate = false;
 
@@ -1041,12 +1044,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
     }
 
     private void updateSortingProperties(UIDL uidl) {
-        String oldSortColumn = sortColumn;
+        oldSortColumn = sortColumn;
         if (uidl.hasVariable("sortascending")) {
             sortAscending = uidl.getBooleanVariable("sortascending");
             sortColumn = uidl.getStringVariable("sortcolumn");
         }
+    }
 
+    private void resizeSortedColumnForSortIndicator() {
         // Force recalculation of the captionContainer element inside the header
         // cell to accomodate for the size of the sort arrow.
         HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn);