Browse Source

Remove obsolete OnVisualParentChanged.

pull/72/merge
Steven Kirk 11 years ago
parent
commit
65def11dbd
  1. 4
      Perspex.Controls/GridSplitter.cs
  2. 3
      Perspex.Input/InputElement.cs
  3. 6
      Perspex.SceneGraph/Visual.cs
  4. 10
      Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs
  5. 38
      Tests/Perspex.SceneGraph.UnitTests/VisualTests.cs

4
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<Grid>();
}
}

3
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();
}

6
Perspex.SceneGraph/Visual.cs

@ -352,11 +352,6 @@ namespace Perspex
{
}
[Obsolete("Use OnAttachedToVisualTree instead")]
protected virtual void OnVisualParentChanged(Visual oldParent)
{
}
/// <summary>
/// Called when a property changes that should invalidate the visual.
/// </summary>
@ -449,7 +444,6 @@ namespace Perspex
}
this.visualParent = value;
this.OnVisualParentChanged(old);
if (oldRoot != null)
{

10
Tests/Perspex.SceneGraph.UnitTests/TestVisual.cs

@ -27,8 +27,6 @@ namespace Perspex.SceneGraph.UnitTests
get { return base.InheritanceParent; }
}
public event EventHandler<ParamEventArgs<Visual>> VisualParentChangedCalled;
public event EventHandler<ParamEventArgs<IRenderRoot>> AttachedToVisualTreeCalled;
public event EventHandler<ParamEventArgs<IRenderRoot>> 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<Visual>(oldParent));
}
}
protected override void OnAttachedToVisualTree(IRenderRoot root)
{
if (this.AttachedToVisualTreeCalled != null)

38
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);
}
}
}

Loading…
Cancel
Save