diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-26 16:16:01 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-08-27 15:00:05 +0000 |
commit | 5b814e9ddef5473d7a990b3aa090bac4025aee8a (patch) | |
tree | 26ff8e84000d27170637fb6a92b467f86522bbac | |
parent | 907332e30f279fdc73fbc46785344a7ff3b33660 (diff) | |
download | vaadin-framework-5b814e9ddef5473d7a990b3aa090bac4025aee8a.tar.gz vaadin-framework-5b814e9ddef5473d7a990b3aa090bac4025aee8a.zip |
Fix ActiveCellHandler scrolling to frozen columns (#13334)
Change-Id: Ia4fe23e70e6a1585a1ecd91ef44212cde286d29d
-rw-r--r-- | client/src/com/vaadin/client/ui/grid/Grid.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java index 4efe42a825..442bc1a228 100644 --- a/client/src/com/vaadin/client/ui/grid/Grid.java +++ b/client/src/com/vaadin/client/ui/grid/Grid.java @@ -298,7 +298,12 @@ public class Grid<T> extends Composite implements if (container == escalator.getBody()) { scrollToRow(activeRow); } - escalator.scrollToColumn(activeColumn, ScrollDestination.ANY, 10); + + if (activeColumn >= escalator.getColumnConfiguration() + .getFrozenColumnCount()) { + escalator.scrollToColumn(activeColumn, ScrollDestination.ANY, + 10); + } if (this.container == container) { if (container != escalator.getBody()) { |