diff options
| -rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 6 |
1 files changed, 5 insertions, 1 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 908446dfee..01c069143b 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -5322,8 +5322,12 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, } else { this.hidden = hidden; - final int columnIndex = grid.getVisibleColumns() + int columnIndex = grid.getVisibleColumns() .indexOf(this); + // Correct column index for multiselect mode + if (grid.getSelectionColumn().isPresent()) { + columnIndex--; + } grid.escalator.getColumnConfiguration() .insertColumns(columnIndex, 1); |