aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/com/vaadin/ui/GridLayout.java
diff options
context:
space:
mode:
authorTien Nguyen <nqtien.dev@gmail.com>2017-04-04 17:39:24 +0300
committerIlia Motornyi <elmot@vaadin.com>2017-04-04 16:39:24 +0200
commit1a30320913e8b9ea851af3ed4a659f969aa92ee6 (patch)
tree195bbd2c65d79ae4cd50824b411ab42b9548ce03 /server/src/main/java/com/vaadin/ui/GridLayout.java
parent973564d475617298e5cb9c7e9286d5d3e40dcf66 (diff)
downloadvaadin-framework-1a30320913e8b9ea851af3ed4a659f969aa92ee6.tar.gz
vaadin-framework-1a30320913e8b9ea851af3ed4a659f969aa92ee6.zip
Fix bug column and row expand ratio are not persisted
Fixes #9009
Diffstat (limited to 'server/src/main/java/com/vaadin/ui/GridLayout.java')
-rw-r--r--server/src/main/java/com/vaadin/ui/GridLayout.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java
index a9607ca96f..5a02f49fb8 100644
--- a/server/src/main/java/com/vaadin/ui/GridLayout.java
+++ b/server/src/main/java/com/vaadin/ui/GridLayout.java
@@ -1277,14 +1277,14 @@ public class GridLayout extends AbstractLayout
}
setRows(Math.max(rows.size(), 1));
Map<Component, Alignment> alignments = new HashMap<>();
- List<Integer> columnExpandRatios = new ArrayList<>();
+ List<Float> columnExpandRatios = new ArrayList<>();
for (int row = 0; row < rowElements.size(); ++row) {
Element rowElement = rowElements.get(row);
// Row Expand
if (rowElement.hasAttr("expand")) {
- int expand = DesignAttributeHandler.readAttribute("expand",
- rowElement.attributes(), int.class);
+ float expand = DesignAttributeHandler.readAttribute("expand",
+ rowElement.attributes(), float.class);
setRowExpandRatio(row, expand);
}
@@ -1334,11 +1334,11 @@ public class GridLayout extends AbstractLayout
if (row == 0) {
if (col.hasAttr("expand")) {
for (String expand : col.attr("expand").split(",")) {
- columnExpandRatios.add(Integer.parseInt(expand));
+ columnExpandRatios.add(Float.parseFloat(expand));
}
} else {
for (int c = 0; c < colspan; ++c) {
- columnExpandRatios.add(0);
+ columnExpandRatios.add(0f);
}
}
}
@@ -1442,7 +1442,7 @@ public class GridLayout extends AbstractLayout
// Row Expand
DesignAttributeHandler.writeAttribute("expand", row.attributes(),
- (int) getRowExpandRatio(i), 0, int.class, designContext);
+ getRowExpandRatio(i), 0.0f, float.class, designContext);
int colspan = 1;
Element col;
@@ -1483,7 +1483,7 @@ public class GridLayout extends AbstractLayout
// A column with expand and no content in the end of
// first row needs to be present.
for (int c = j; c < componentMap[i].length; ++c) {
- if ((int) getColumnExpandRatio(c) > 0) {
+ if (getColumnExpandRatio(c) > 0) {
hasExpands = true;
}
}
@@ -1525,7 +1525,7 @@ public class GridLayout extends AbstractLayout
String expands = "";
boolean expandRatios = false;
for (int c = 0; c < colspan; ++c) {
- int colExpand = (int) getColumnExpandRatio(j + c);
+ float colExpand = getColumnExpandRatio(j + c);
if (colExpand > 0) {
expandRatios = true;
}