summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-01-03 11:13:17 +0200
committerLeif Åstrand <leif@vaadin.com>2013-01-03 11:17:54 +0200
commit40d9b11ed9542db451358a8ba0591282971d17b3 (patch)
tree17627acad4045bd623dfbe9c094c513e9cbe24c4 /uitest/src/com/vaadin
parentbe39a69211330310848778af9096c50dd53b93ad (diff)
downloadvaadin-framework-40d9b11ed9542db451358a8ba0591282971d17b3.tar.gz
vaadin-framework-40d9b11ed9542db451358a8ba0591282971d17b3.zip
Update AbstractOrderedLayout calculation logic
* Always use expansion logic if the layout's size is fixed * Ensure e.g. expansion changes happen even if no hierarchy or measurement changes (#10161) * Separate the calculation of expand ratios from the adjustment for the sizes of children without expansion * Ensure there are element resize listeners for all elements that should be measured (#10488) * Postpone calculations if there are elements that have not yet been measured * Use measurements for fixing the height under more circumstances * Only update based on hierarchy & state if something might have changed Change-Id: I8542afbcb7e93d44bd0dff751a56ed10033937fc
Diffstat (limited to 'uitest/src/com/vaadin')
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index da6946f432..fe1dfe3e6d 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -321,6 +321,18 @@ public class OrderedLayoutCases extends AbstractTestUI {
setChildState(0, 2, 1);
// Height: 100% to middle child
setChildState(1, 1, 4);
+ }
+ }));
+
+ caseBar.addComponent(new Button("Undefined + alignments",
+ new ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ resetState();
+ // Height: 350px to left child
+ setChildState(0, 1, 2);
+ // Short caption to left child
+ setChildState(0, 2, 1);
// Alignment: bottom left to right child
setChildState(2, 4, 7);
}