From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Thu, 17 Dec 2015 13:56:43 +0000 (+0200)
Subject: Verify Column width after all sort related cell changes (#16597)
X-Git-Tag: 7.6.0.rc1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d6cd0df3c279f1c24ac370488a5b6993c8424d0;p=vaadin-framework.git

Verify Column width after all sort related cell changes (#16597)

This fixes an IE8 issue where multisorting is not shown correctly.

Change-Id: Id68103f06baf9e3ae20cb2714407b467829ef1a0
---

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 2207abe408..28c26893ef 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -5688,14 +5688,8 @@ public class Grid<T> extends ResizeComposite implements
 
             if (SortDirection.ASCENDING == sortingOrder.getDirection()) {
                 cellElement.addClassName("sort-asc");
-                if (!sortedBefore) {
-                    verifyColumnWidth(column);
-                }
             } else {
                 cellElement.addClassName("sort-desc");
-                if (!sortedBefore) {
-                    verifyColumnWidth(column);
-                }
             }
 
             int sortIndex = Grid.this.getSortOrder().indexOf(sortingOrder);
@@ -5705,6 +5699,10 @@ public class Grid<T> extends ResizeComposite implements
                 cellElement.setAttribute("sort-order",
                         String.valueOf(sortIndex + 1));
             }
+
+            if (!sortedBefore) {
+                verifyColumnWidth(column);
+            }
         }
 
         /**