summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2009-09-28 14:21:34 +0000
committerArtur Signell <artur.signell@itmill.com>2009-09-28 14:21:34 +0000
commit0f6fbd75f3d8654a06a4e22505874af0e9603489 (patch)
treea700e9cc52e3ea727425f2c4739ead9ee7c01676 /src
parent9fcc14f91094a4cecfa2785ef8b85a5fe7f32d8f (diff)
downloadvaadin-framework-0f6fbd75f3d8654a06a4e22505874af0e9603489.tar.gz
vaadin-framework-0f6fbd75f3d8654a06a4e22505874af0e9603489.zip
Fix for #3421 - GridLayout fails to resize container when a child caption changes size
svn changeset:8964/svn branch:6.1
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java7
1 files changed, 7 insertions, 0 deletions
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++) {