Handle reparenting controls in SceneBuilder.

Attempt #2 after db8751d caused issue #3019.
AvaloniaUI · Sep 23, 2019 · c569f4b · c569f4b
1 parent 25e0ed5
commit c569f4b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -53,6 +53,16 @@ public bool Update(Scene scene, IVisual visual)
 
             if (visual.VisualRoot != null)
             {
+                if (node?.Parent != null &&
+                    visual.VisualParent != null &&
+                    node.Parent.Visual != visual.VisualParent)
+                {
+                    // The control has changed parents. Remove the node and recurse into the new parent node.
+                    ((VisualNode)node.Parent).RemoveChild(node);
+                    Deindex(scene, node);
+                    node = (VisualNode)scene.FindNode(visual.VisualParent);
+                }
+
                 if (visual.IsVisible)
                 {
                     // If the node isn't yet part of the scene, find the nearest ancestor that is.