From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 28 Sep 2009 14:21:34 +0000 (+0000)
Subject: Fix for #3421 - GridLayout fails to resize container when a child caption changes... 
X-Git-Tag: 6.7.0.beta1~2460^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0f6fbd75f3d8654a06a4e22505874af0e9603489;p=vaadin-framework.git

Fix for #3421 - GridLayout fails to resize container when a child caption changes size

svn changeset:8964/svn branch:6.1
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index f52b6fc7e2..7e9cf96d72 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -655,6 +655,13 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
                 cell.cc.setHeight("");
 
                 cell.cc.updateWidgetSize();
+
+                /*
+                 * If this is the result of an caption icon onload event the
+                 * caption size may have changed
+                 */
+                cell.cc.updateCaptionSize();
+
                 int width = cell.getWidth();
                 int allocated = columnWidths[cell.col];
                 for (int i = 1; i < cell.colspan; i++) {