diff options
Diffstat (limited to 'client')
| -rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 01c069143b..6d22dfc5ca 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -5324,10 +5324,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, int columnIndex = grid.getVisibleColumns() .indexOf(this); - // Correct column index for multiselect mode - if (grid.getSelectionColumn().isPresent()) { - columnIndex--; - } grid.escalator.getColumnConfiguration() .insertColumns(columnIndex, 1); @@ -5335,6 +5331,10 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, // escalator doesn't handle situation where the added column // would be the last frozen column int gridFrozenColumns = grid.getFrozenColumnCount(); + // Correct column index for multiselect mode + if (grid.getSelectionColumn().isPresent()) { + gridFrozenColumns++; + } int escalatorFrozenColumns = grid.escalator .getColumnConfiguration().getFrozenColumnCount(); if (gridFrozenColumns > escalatorFrozenColumns |