From d9db71392ed5e433653cda352547b4eda797014b Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 11 May 2012 16:24:27 +0300 Subject: [PATCH] Fixed a bug in BoxLayout which caused spacing elements not to be measured --- .../terminal/gwt/client/ui/AbstractBoxLayoutConnector.java | 3 ++- .../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("

Layout resize test

", Label.ContentMode.XHTML)); -- 2.39.5