From 2a51214f1a4169140640b6fd0d4a31aab0e57451 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 7 Aug 2008 11:27:59 +0000 Subject: [PATCH] Fixed #1953 IGridlayout fails to render rows with colspanned rows properly svn changeset:5155/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/IGridLayout.java | 2 +- src/com/itmill/toolkit/tests/tickets/Ticket1953.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 68bb5396c1..f0593e734f 100644 --- 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 8718619400..4357a9bac3 100644 --- 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); -- 2.39.5