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

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 f52b6fc7e2bf7a0ed236796ae9f55f70d63de308..7e9cf96d7210829b77c661ecdb5a9c761018458a 100644 (file)
--- 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++) {