From 2b5ea21ff86f3a1152fd817fc2c1e5e9f9e25d2e Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Tue, 30 Jul 2019 09:42:20 +0300 Subject: Apply offset to column index depending on presense of selection column (#11667) * Apply offset to column index depending on presense of selection column After testing this manually I noticed that offset correction needs to be negative * Add the testing UI --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'client/src') 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 9f82d3339f..76fe46fbb7 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -7958,7 +7958,11 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, if (!event.getCell().isHeader()) { return; } - if (event.getCell().getColumnIndex() < getFrozenColumnCount()) { + int offset = 0; // apply offset depending on selection column, see #10546 + if (getSelectionColumn().isPresent()) { + offset = -1; + } + if (event.getCell().getColumnIndex()+offset < getFrozenColumnCount()) { return; } -- cgit v1.2.3