From 8405496a7a6f6808fe829485c677bb73b4fa670c Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 30 Jan 2017 15:19:55 +0200 Subject: Prevent reorder of frozen columns when there are hidden columns (#8278) * Rename variables to indicate whether they use DOM index or Grid index Grid indexes include hidden columns, DOM/Escalator indexes do not * Prevent reorder of frozen columns when there are hidden columns Fixes #8265 * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns * Merge branch '7.7' into _grid-no-reorder-of-frozen-columns --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 d215b3c565..7ef2167f1c 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -7602,8 +7602,7 @@ public class Grid extends ResizeComposite implements HasSelectionHandlers, if (!event.getCell().isHeader()) { return; } - if (event.getCell().getColumnIndex() < escalator - .getColumnConfiguration().getFrozenColumnCount()) { + if (event.getCell().getColumnIndex() < getFrozenColumnCount()) { return; } -- cgit v1.2.3