fixes #2267, bug with child size changes when cells had colspan/rowspan

svn changeset:6101/svn branch:trunk

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 3be1f34971bfd2f4f12e5f68cff69e155cdd13c8..8f489ab9ef265c62c7ce63a27c0c127994eb073b 100644 (file)
--- 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;