diff options
| author | Jouni Koivuviita <jouni@jounikoivuviita.com> | 2012-05-11 16:24:27 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@jounikoivuviita.com> | 2012-05-11 16:24:27 +0300 |
| commit | d9db71392ed5e433653cda352547b4eda797014b (patch) | |
| tree | 373c8519fee86eee1ae514314a52199614a5d88e | |
| parent | 25c3f362b93f6c4a90f5c7b9f84481e3e9cd8ac1 (diff) | |
| download | vaadin-framework-d9db71392ed5e433653cda352547b4eda797014b.tar.gz vaadin-framework-d9db71392ed5e433653cda352547b4eda797014b.zip | |
Fixed a bug in BoxLayout which caused spacing elements not to be measured
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java | 3 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java index 09988a33a2..f8cffc74df 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java @@ -169,7 +169,8 @@ PostLayoutListener { } slot.setExpandRatio(expandRatio); - if (slot.getSpacingElement() != null && needsExpand()) { + // TODO only needed if expand ratios are used + if (slot.getSpacingElement() != null) { getLayoutManager().addElementResizeListener( slot.getSpacingElement(), spacingResizeListener); } else if (slot.getSpacingElement() != null) { diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index 70777b6441..1bcf8cf1ae 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -22,14 +22,15 @@ public class LayoutResizeTest extends TestBase { HorizontalSplitPanel split1 = new HorizontalSplitPanel(); split1.setSizeFull(); - addComponent(split1); + // addComponent(split1); VerticalLayout left = new VerticalLayout(); left.setSizeFull(); - split1.setFirstComponent(left); + // split1.setFirstComponent(left); left.setSpacing(true); - left.setMargin(true); + // left.setMargin(true); + addComponent(left); left.addComponent(new Label("<h2>Layout resize test</h2>", Label.ContentMode.XHTML)); |