From 0e969cd106742e1d861687d760a51849797631ce Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 7 Sep 2010 16:38:54 +0000 Subject: Fix for #5525 - Moving a 100% wide component between cells does not work in GridLayout svn changeset:14768/svn branch:6.4 --- src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java index 1135901754..59dd4f9611 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java @@ -943,17 +943,19 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { assert paintable != null; if (cc == null || cc.getWidget() != paintable) { if (widgetToComponentContainer.containsKey(paintable)) { + // Component moving from one place to another cc = widgetToComponentContainer.get(paintable); cc.setWidth(""); cc.setHeight(""); } else { + // A new component cc = new ChildComponentContainer((Widget) paintable, CellBasedLayout.ORIENTATION_VERTICAL); widgetToComponentContainer.put((Widget) paintable, cc); - paintableToCell.put(paintable, this); cc.setWidth(""); canvas.add(cc, 0, 0); } + paintableToCell.put(paintable, this); } cc.renderChild(childUidl, client, -1); if (sizeChangedDuringRendering && Util.isCached(childUidl)) { -- cgit v1.2.3