From: Marko Grönroos <magi@iki.fi>
Date: Fri, 16 Nov 2007 14:05:41 +0000 (+0000)
Subject: Fixed problem with an extra row and col in IGridLayout.
X-Git-Tag: 6.7.0.beta1~5547
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f11c36955542350dfa8b92d174ef553cc6db2b3;p=vaadin-framework.git

Fixed problem with an extra row and col in IGridLayout.

svn changeset:2855/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 e532e8b79f..d0ae64ed02 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -34,12 +34,10 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
         for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
             UIDL r = (UIDL) i.next();
             if ("gr".equals(r.getTag())) {
-                row++;
                 column = 0;
                 for (Iterator j = r.getChildIterator(); j.hasNext();) {
                     UIDL c = (UIDL) j.next();
                     if ("gc".equals(c.getTag())) {
-                        column++;
                         int w;
                         if (c.hasAttribute("w")) {
                             w = c.getIntAttribute("w");
@@ -67,9 +65,10 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
                             }
                             ((Paintable) child).updateFromUIDL(u, client);
                         }
-                        column += w - 1;
+                        column += w;
                     }
                 }
+                row++;
             }
         }