From 599387b330f66f0dbe6087d2fe829bc251fef6c1 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Tue, 28 Apr 2020 13:12:08 +0300 Subject: Fix hiding / un-hiding with frozen columns in multiselect mode (#11972) The previous patch https://github.com/vaadin/framework/pull/11951 did fix the problem (frozen column indicator wrongly positioned) it was meant to, but caused a regression in hiding / un-hiding. This new fix addresses both problems, i.e. it applies multiselect column compensation in other way, without causing problem in hiding / un-hiding logic Fixes https://github.com/vaadin/framework/issues/11970 --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client') 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 extends ResizeComposite implements HasSelectionHandlers, 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 extends ResizeComposite implements HasSelectionHandlers, // 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 -- cgit v1.2.3