From: Marko Grönroos <magi@iki.fi>
Date: Thu, 29 Nov 2007 19:15:28 +0000 (+0000)
Subject: Fixes 1204: added rowspan in IGridLayout.
X-Git-Tag: 6.7.0.beta1~5379
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=767b8aff29cdd512acf4580e8a2a883775199c00;p=vaadin-framework.git

Fixes 1204: added rowspan in IGridLayout.

svn changeset:3050/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 2d3328a4a5..c4e6192674 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -37,6 +37,7 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
                 for (Iterator j = r.getChildIterator(); j.hasNext();) {
                     UIDL c = (UIDL) j.next();
                     if ("gc".equals(c.getTag())) {
+                        // Set cell width
                         int w;
                         if (c.hasAttribute("w")) {
                             w = c.getIntAttribute("w");
@@ -46,6 +47,16 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
                         ((FlexCellFormatter) getCellFormatter()).setColSpan(
                                 row, column, w);
 
+                        // Set cell height
+                        int h;
+                        if (c.hasAttribute("h")) {
+                            h = c.getIntAttribute("h");
+                        } else {
+                            h = 1;
+                        }
+                        ((FlexCellFormatter) getCellFormatter()).setRowSpan(
+                                row, column, h);
+
                         UIDL u = c.getChildUIDL(0);
                         if (u != null) {
                             Widget child = client.getWidget(u);