diff --git a/Perspex.Controls/GridSplitter.cs b/Perspex.Controls/GridSplitter.cs index 07391d8305..4cee47aa26 100644 --- a/Perspex.Controls/GridSplitter.cs +++ b/Perspex.Controls/GridSplitter.cs @@ -9,6 +9,7 @@ namespace Perspex.Controls using System; using Perspex.Controls.Primitives; using Perspex.Input; + using Rendering; using Perspex.VisualTree; public class GridSplitter : Thumb @@ -27,8 +28,9 @@ namespace Perspex.Controls } } - protected override void OnVisualParentChanged(Visual oldParent) + protected override void OnAttachedToVisualTree(IRenderRoot root) { + base.OnAttachedToVisualTree(root); this.grid = this.GetVisualParent(); } } diff --git a/Perspex.Input/InputElement.cs b/Perspex.Input/InputElement.cs index 4919fd56ee..b80e3f24a1 100644 --- a/Perspex.Input/InputElement.cs +++ b/Perspex.Input/InputElement.cs @@ -219,8 +219,9 @@ namespace Perspex.Input } } - protected override void OnVisualParentChanged(Visual oldParent) + protected override void OnAttachedToVisualTree(IRenderRoot root) { + base.OnAttachedToVisualTree(root); this.UpdateIsEnabledCore(); } diff --git a/Perspex.SceneGraph/Visual.cs b/Perspex.SceneGraph/Visual.cs index 9c119cc802..98776e74e6 100644 --- a/Perspex.SceneGraph/Visual.cs +++ b/Perspex.SceneGraph/Visual.cs @@ -352,11 +352,6 @@ namespace Perspex { } - [Obsolete("Use OnAttachedToVisualTree instead")] - protected virtual void OnVisualParentChanged(Visual oldParent) - { - } - /// /// Called when a property changes that should invalidate the visual. /// @@ -449,7 +444,6 @@ namespace Perspex } this.visualParent = value; - this.OnVisualParentChanged(old); if (oldRoot != null) { diff --git a/Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs b/Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs index c223b8244c..ddd91adebe 100644 --- a/Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs +++ b/Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs @@ -27,8 +27,6 @@ namespace Perspex.SceneGraph.UnitTests get { return base.InheritanceParent; } } - public event EventHandler> VisualParentChangedCalled; - public event EventHandler> AttachedToVisualTreeCalled; public event EventHandler> DetachedFromVisualTreeCalled; @@ -53,14 +51,6 @@ namespace Perspex.SceneGraph.UnitTests this.ClearVisualChildren(); } - protected override void OnVisualParentChanged(Visual oldParent) - { - if (this.VisualParentChangedCalled != null) - { - this.VisualParentChangedCalled(this, new ParamEventArgs(oldParent)); - } - } - protected override void OnAttachedToVisualTree(IRenderRoot root) { if (this.AttachedToVisualTreeCalled != null) diff --git a/Tests/Perspex.SceneGraph.UnitTests/VisualTests.cs b/Tests/Perspex.SceneGraph.UnitTests/VisualTests.cs index 341d65ee9d..bf5b105a7c 100644 --- a/Tests/Perspex.SceneGraph.UnitTests/VisualTests.cs +++ b/Tests/Perspex.SceneGraph.UnitTests/VisualTests.cs @@ -71,43 +71,5 @@ namespace Perspex.SceneGraph.UnitTests Assert.Equal(new Visual[] { null, null }, result); } - - [Fact] - public void ParentChanged_Attached_Methods_Should_Be_Called_In_Right_Order() - { - var target = new TestRoot(); - var child = new TestVisual(); - int changed = 0; - int attched = 0; - int i = 1; - - child.VisualParentChangedCalled += (s, e) => changed = i++; - child.AttachedToVisualTreeCalled += (s, e) => attched = i++; - - target.AddChild(child); - - Assert.Equal(1, changed); - Assert.Equal(2, attched); - } - - [Fact] - public void ParentChanged_Detached_Methods_Should_Be_Called_In_Right_Order() - { - var target = new TestRoot(); - var child = new TestVisual(); - int changed = 0; - int detached = 0; - int i = 1; - - target.AddChild(child); - - child.VisualParentChangedCalled += (s, e) => changed = i++; - child.DetachedFromVisualTreeCalled += (s, e) => detached = i++; - - target.ClearChildren(); - - Assert.Equal(1, changed); - Assert.Equal(2, detached); - } } }