aboutsummaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-07-30 15:06:36 +0300
committerVaadin Code Review <review@vaadin.com>2014-08-05 07:29:30 +0000
commitdf68ce33bde680de12cdf6457311c35662252da2 (patch)
tree6f96a99f5a1ea317518df082faa415a0db13610d /shared
parent681e0d6dc574e6c7f2993f04e40700179f0ef69f (diff)
downloadvaadin-framework-df68ce33bde680de12cdf6457311c35662252da2.tar.gz
vaadin-framework-df68ce33bde680de12cdf6457311c35662252da2.zip
Add support for server side colspans in Headers and Footers (#13334)
Change-Id: I311aade38f4e725405a190ca1b6f114b4ac07053
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
index 859e01f089..41f56199da 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
@@ -35,6 +35,8 @@ public class GridStaticSectionState implements Serializable {
public List<CellState> cells = new ArrayList<CellState>();
public boolean defaultRow = false;
+
+ public List<List<Integer>> cellGroups = new ArrayList<List<Integer>>();
}
public List<RowState> rows = new ArrayList<RowState>();