Support column reordering from all header rows. (#16643)

Change-Id: I78a4a50b011576a026518a58c36822a383979986

1 files changed, 8 insertions, 6 deletions

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index fc208843e4..ebc2fcf97e 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -2930,6 +2930,13 @@ public class Grid<T> extends ResizeComposite implements
             tableHeader.setClassName(escalator.getHeader().getElement()
                     .getClassName());
             dropMarker.setClassName(getStylePrimaryName() + "-drop-marker");
+            int topOffset = 0;
+            for (int i = 0; i < eventCell.getRowIndex(); i++) {
+                topOffset += escalator.getHeader().getRowElement(i)
+                        .getFirstChildElement().getOffsetHeight();
+            }
+            tableHeader.getStyle().setTop(topOffset, Unit.PX);
+
             getElement().appendChild(table);
         }
 
@@ -5375,17 +5382,12 @@ public class Grid<T> extends ResizeComposite implements
 
     private boolean handleHeaderCellDragStartEvent(Event event,
             RowContainer container) {
-        if (!columnReorderingAllowed) {
+        if (!isColumnReorderingAllowed()) {
             return false;
         }
         if (container != escalator.getHeader()) {
             return false;
         }
-        // for now only support reordering of default row as the only row
-        if (!getHeader().getRow(eventCell.getRowIndex()).isDefault()
-                || getHeader().getRowCount() != 1) {
-            return false;
-        }
         if (eventCell.getColumnIndex() < escalator.getColumnConfiguration()
                 .getFrozenColumnCount()) {
             return false;