summaryrefslogtreecommitdiffstats
path: root/server/src/com
diff options
context:
space:
mode:
authorTeppo Kurki <teppo.kurki@vaadin.com>2015-06-07 23:54:37 +0300
committerVaadin Code Review <review@vaadin.com>2015-06-08 07:19:06 +0000
commitb0d5315e8ba95d099f93dc2d16339033a6525b59 (patch)
treee9b5633df45bef160b7352348b51ee296b32e79f /server/src/com
parent7456b6cf0c2c7e66b7040af2e793566607d2a447 (diff)
downloadvaadin-framework-b0d5315e8ba95d099f93dc2d16339033a6525b59.tar.gz
vaadin-framework-b0d5315e8ba95d099f93dc2d16339033a6525b59.zip
Forget GridLayout row expand ratios for removed rows (#18166)
Change-Id: I90a28fbc9c7eadac56a1d505d7cc80bb67342aae
Diffstat (limited to 'server/src/com')
-rw-r--r--server/src/com/vaadin/ui/GridLayout.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index e510fa09fb..96b58d7e67 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -833,7 +833,13 @@ public class GridLayout extends AbstractLayout implements
}
}
}
- // TODO forget expands for removed rows
+ // Forget expands for removed rows
+ if (rows < getRows()) {
+ for (int i = rows - 1; i < getRows(); i++) {
+ rowExpandRatio.remove(i);
+ getState().explicitRowRatios.remove(i);
+ }
+ }
getState().rows = rows;
}