diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-04-17 09:42:07 +0300 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-04-17 09:42:52 +0300 |
| commit | 33c61533ad8a3ed8a38ea606aa9e3d5f4da4dae8 (patch) | |
| tree | 3d4edf6b9676e0967b7a08e11642c66cf1abfe0c /server/src/com/vaadin/ui/Grid.java | |
| parent | 6ed28680346c648a6b4e974568a56f6d4d0e000b (diff) | |
| parent | 0636e2d177a933dae13e50eb1b1f4609855f735e (diff) | |
| download | vaadin-framework-33c61533ad8a3ed8a38ea606aa9e3d5f4da4dae8.tar.gz vaadin-framework-33c61533ad8a3ed8a38ea606aa9e3d5f4da4dae8.zip | |
Merge branch 'master' into grid-7.5
Change-Id: I6175398df4c3a07656a2682843615a0d7bd32a45
Diffstat (limited to 'server/src/com/vaadin/ui/Grid.java')
| -rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index a7ff15c8dd..504e0e6eae 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -5985,10 +5985,6 @@ public class Grid extends AbstractComponent implements SelectionNotifier, setEditorEnabled(DesignAttributeHandler.readAttribute("editable", attrs, boolean.class)); } - if (attrs.hasKey("frozen-columns")) { - setFrozenColumnCount(DesignAttributeHandler.readAttribute( - "frozen-columns", attrs, int.class)); - } if (attrs.hasKey("rows")) { setHeightByRows(DesignAttributeHandler.readAttribute("rows", attrs, double.class)); @@ -6045,6 +6041,12 @@ public class Grid extends AbstractComponent implements SelectionNotifier, } } } + + // Read frozen columns after columns are read. + if (attrs.hasKey("frozen-columns")) { + setFrozenColumnCount(DesignAttributeHandler.readAttribute( + "frozen-columns", attrs, int.class)); + } } @Override |