From 3c4912c245ae5f2721b755d6f92ee04c2c8f54f6 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni@jounikoivuviita.com>
Date: Wed, 18 Apr 2012 12:56:50 +0300
Subject: [PATCH] Fixed expand ratio calculations for BoxLayout (was not taking
 caption width into account when horizontal expand was used)

---
 .../vaadin/terminal/gwt/client/ui/VBoxLayout.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
index 8f9980bf5a..540ad58c2b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
@@ -616,10 +616,19 @@ public class VBoxLayout extends FlowPanel {
                                                 .getCaptionElement());
                             }
                         } else {
-                            totalSize += layoutManager.getOuterWidth(slot
-                                    .getWidget().getElement())
+                            int max = -1;
+                            max = layoutManager.getOuterWidth(slot.getWidget()
+                                    .getElement())
                                     - layoutManager.getMarginWidth(slot
                                             .getWidget().getElement());
+                            if (slot.hasCaption()) {
+                                int max2 = layoutManager.getOuterWidth(slot
+                                        .getCaptionElement())
+                                        - layoutManager.getMarginWidth(slot
+                                                .getCaptionElement());
+                                max = Math.max(max, max2);
+                            }
+                            totalSize += max;
                         }
                     } else {
                         totalSize += vertical ? slot.getOffsetHeight() : slot
-- 
2.39.5