]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed a bug in BoxLayout which caused spacing elements not to be measured
authorJouni Koivuviita <jouni@jounikoivuviita.com>
Fri, 11 May 2012 13:24:27 +0000 (16:24 +0300)
committerJouni Koivuviita <jouni@jounikoivuviita.com>
Fri, 11 May 2012 13:24:27 +0000 (16:24 +0300)
src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java
tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java

index 09988a33a2e974b87bcbee46c7e240b20c6c1048..f8cffc74df406f98deb5b3bb0ff02a33dbbf8c01 100644 (file)
@@ -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) {
index 70777b644181b03d151463dfbf90e1dcce82c72c..1bcf8cf1aeaac6bf7a3333d5bed2fa72664cfb40 100644 (file)
@@ -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));