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 e532e8b79ff78d39b907365ae594c332ccc6ddcd..d0ae64ed02f5016f5fdcafca44e18ea94ce42089 100644 (file)
--- 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++;
             }
         }