Fixed #1953 IGridlayout fails to render rows with colspanned rows properly

svn changeset:5155/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 68bb5396c1db05bbc686fb7f3a99b413bdf3cda2..f0593e734f3cfec1e4857d29f4c63ff291db0d52 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -215,7 +215,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container,
                                     child.updateFromUIDL(u, client);
                                 }
                             }
-                            column += w;
+                            column++;
                         }
                     }
                     row++;

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
index 87186194003d717eda7877e5ff882ab14957096d..4357a9bac340b4b7082e126a1ad66717522c9e80 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
@@ -34,12 +34,12 @@ public class Ticket1953 extends Application {
         gl.addComponent(new Label("3,0"), 3, 0);
         gl.addComponent(new Label("4,0"), 4, 0);
 
-        gl.addComponent(new Label("4,1"), 1, 4);
-        gl.addComponent(new Label("4,2"), 2, 4);
+        gl.addComponent(new Label("1,4"), 1, 4);
+        gl.addComponent(new Label("2,4"), 2, 4);
         gl.addComponent(new Label("3,4"), 3, 4);
-        gl.addComponent(new Label("4,3"), 4, 4);
+        gl.addComponent(new Label("4,4"), 4, 4);
 
-        gl.addComponent(new Label("1-2,1-2"), 1, 1, 2, 2);
+        gl.addComponent(new Label("1-1 -> 2-2"), 1, 1, 2, 2);
         gl.addComponent(new Label("3,1"), 3, 1);
         gl.addComponent(new Label("3,2"), 3, 2);
         gl.addComponent(new Label("3,3"), 3, 3);