From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 12 Nov 2008 06:50:45 +0000 (+0000)
Subject: Fixed caption width when located after component
X-Git-Tag: 6.7.0.beta1~3829
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5fc82be2219cae2931f892d0dc8a2f4c272cc434;p=vaadin-framework.git

Fixed caption width when located after component

svn changeset:5865/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index 426c194253..73b92b360e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -657,7 +657,11 @@ public class ChildComponentContainer extends Panel {
 
         // Also update caption max width
         if (caption != null) {
-            caption.setMaxWidth(width);
+            if (caption.shouldBePlacedAfterComponent()) {
+                caption.setMaxWidth(captionWidth);
+            } else {
+                caption.setMaxWidth(width);
+            }
             captionWidth = caption.getRenderedWidth();
         }