diff options
| -rwxr-xr-x | compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java index 1d2f88f570..4a7265a525 100755 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java @@ -2145,13 +2145,19 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, // sometimes focus handling twists the editor row out of alignment // with the grid itself and the position needs to be compensated for - TableRowElement rowElement = grid.getEscalator().getBody() - .getRowElement(grid.getEditor().getRow()); - int rowLeft = rowElement.getAbsoluteLeft(); - int editorLeft = cellWrapper.getAbsoluteLeft(); - if (editorLeft != rowLeft + frozenWidth) { - cellWrapper.getStyle().setLeft(newLeft + rowLeft - editorLeft, - Unit.PX); + try { + TableRowElement rowElement = grid.getEscalator().getBody() + .getRowElement(grid.getEditor().getRow()); + int rowLeft = rowElement.getAbsoluteLeft(); + int editorLeft = cellWrapper.getAbsoluteLeft(); + if (editorLeft != rowLeft + frozenWidth) { + cellWrapper.getStyle().setLeft(newLeft + rowLeft - editorLeft, + Unit.PX); + } + } catch (IllegalStateException e) { + // IllegalStateException may occur if user has scrolled Grid so + // that Escalator has updated, and row under Editor is no longer + // there } } |