From a9f6aacd6ac8ada4cd4a380256d6dcce34619163 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 24 Jun 2010 16:49:26 +0000
Subject: [PATCH] fixes #5227

svn changeset:13924/svn branch:6.4
---
 src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index 416455c162..aa202df2c6 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -213,8 +213,6 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
         rendering = false;
         sizeChangedDuringRendering = false;
 
-        boolean needsRelativeSizeCheck = false;
-
     }
 
     private static int[] cloneArray(int[] toBeCloned) {
@@ -502,7 +500,9 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
     private void distributeColSpanWidths() {
         for (SpanList list : colSpans) {
             for (Cell cell : list.cells) {
-                int width = cell.getWidth();
+                // cells with relative content may return non 0 here if on
+                // subsequent renders
+                int width = cell.hasRelativeWidth() ? 0 : cell.getWidth();
                 int allocated = columnWidths[cell.col];
                 for (int i = 1; i < cell.colspan; i++) {
                     allocated += spacingPixelsHorizontal
@@ -539,7 +539,9 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
     private void distributeRowSpanHeights() {
         for (SpanList list : rowSpans) {
             for (Cell cell : list.cells) {
-                int height = cell.getHeight();
+                // cells with relative content may return non 0 here if on
+                // subsequent renders
+                int height = cell.hasRelativeHeight() ? 0 : cell.getHeight();
                 int allocated = rowHeights[cell.row];
                 for (int i = 1; i < cell.rowspan; i++) {
                     allocated += spacingPixelsVertical
-- 
2.39.5