From f2869051ea1fbe8eb9763b00c4b6d475d069272c Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Fri, 5 Dec 2008 16:18:47 +0000 Subject: [PATCH] fixes #2267, bug with child size changes when cells had colspan/rowspan svn changeset:6101/svn branch:trunk --- .../itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java index 3be1f34971..8f489ab9ef 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java @@ -713,7 +713,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container { for (int i = 0; i < rowHeights.length; i++) { Cell cell = cells[colIndex][i]; if (cell != null && cell.getChildUIDL() != null - && !cell.hasRelativeWidth()) { + && !cell.hasRelativeWidth() && cell.colspan == 1) { int width = cell.getWidth(); if (width > colW) { colW = width; @@ -742,7 +742,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container { for (int i = 0; i < columnWidths.length; i++) { Cell cell = cells[i][rowIndex]; if (cell != null && cell.getChildUIDL() != null - && !cell.hasRelativeHeight()) { + && !cell.hasRelativeHeight() && cell.rowspan == 1) { int h = cell.getHeight(); if (h > rowH) { rowH = h; -- 2.39.5