Fix for #6060 - Moving a component from a GridLayout to a layout inside the GridLayout causes the client side widget to be lost

svn changeset:16167/svn branch:6.5

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index b4c3dccbc9..44f84b2844 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -207,7 +207,12 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
             paintableToCell.remove(w);
             widgetToComponentContainer.remove(w);
             childComponentContainer.removeFromParent();
-            client.unregisterPaintable((Paintable) w);
+            if (childComponentContainer.getWidget() == w) {
+                // Only unregister if the paintable has not been moved to
+                // another layout and detached from this (hence cc.getWidget()
+                // == null, or w.getParent() != this)
+                client.unregisterPaintable((Paintable) w);
+            }
         }
         nonRenderedWidgets = null;