diff options
| -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()) { |