Merge pull request #1379 from jkoritzinsky/refcount-scene

Make Scene own VisualNodes
AvaloniaUI · Feb 18, 2018 · c8a8e82 · c8a8e82
2 parents 2203b6c + 0d7f577
commit c8a8e82
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -93,5 +93,7 @@ public interface IVisualNode : IDisposable
         /// to hit test children they must be hit tested manually.
         /// </remarks>
         bool HitTest(Point p);
+
+        bool Disposed { get; }
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -98,7 +98,10 @@ public Scene CloneScene()
 
         public void Dispose()
         {
-            Root.Dispose();
+            foreach (var node in _index.Values)
+            {
+                node.Dispose();
+            }
         }
 
         /// <summary>
@@ -137,6 +140,8 @@ public void Remove(IVisualNode node)
             Contract.Requires<ArgumentNullException>(node != null);
 
             _index.Remove(node.Visual);
+
+            node.Dispose();
         }
 
         private VisualNode Clone(VisualNode source, IVisualNode parent, Dictionary<IVisual, IVisualNode> index)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -113,6 +113,11 @@ public double Opacity
         /// <param name="child">The child to add.</param>
         public void AddChild(IVisualNode child)
         {
+            if (child.Disposed)
+            {
+                throw new ObjectDisposedException("Visual node for {node.Visual}");
+            }
+
             EnsureChildrenCreated();
             _children.Add(child);
         }
@@ -135,7 +140,6 @@ public void RemoveChild(IVisualNode child)
         {
             EnsureChildrenCreated();
             _children.Remove(child);
-            child.Dispose();
         }
 
         /// <summary>
@@ -145,13 +149,13 @@ public void RemoveChild(IVisualNode child)
         /// <param name="node">The child to add.</param>
         public void ReplaceChild(int index, IVisualNode node)
         {
-            EnsureChildrenCreated();
-            var old = _children[index];
-            _children[index] = node;
-            if (node != old)
+            if (node.Disposed)
             {
-                old.Dispose(); 
+                throw new ObjectDisposedException("Visual node for {node.Visual}");
             }
+
+            EnsureChildrenCreated();
+            _children[index] = node;
         }
 
         /// <summary>
@@ -332,13 +336,11 @@ private void EnsureDrawOperationsCreated()
                 _drawOperationsCloned = false;
             }
         }
+
+        public bool Disposed { get; }
 
         public void Dispose()
         {
-            foreach (var child in Children)
-            {
-                child.Dispose();
-            }
             _drawOperationsRefCounter?.Dispose();
         }