From 278f12e8d79add6f48b341149e017b13ea271a6c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 10 Feb 2016 21:43:59 +0100 Subject: [PATCH] ControlLocator should work on logical tree. --- src/Markup/Perspex.Markup/ControlLocator.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Markup/Perspex.Markup/ControlLocator.cs b/src/Markup/Perspex.Markup/ControlLocator.cs index 4887de8a15..730c4d24f9 100644 --- a/src/Markup/Perspex.Markup/ControlLocator.cs +++ b/src/Markup/Perspex.Markup/ControlLocator.cs @@ -22,15 +22,15 @@ namespace Perspex.Markup /// The name of the control to find. public static IObservable Track(IControl relativeTo, string name) { - var attached = Observable.FromEventPattern( - x => relativeTo.AttachedToVisualTree += x, - x => relativeTo.DetachedFromVisualTree += x) + var attached = Observable.FromEventPattern( + x => relativeTo.AttachedToLogicalTree += x, + x => relativeTo.DetachedFromLogicalTree += x) .Select(x => ((IControl)x.Sender).FindNameScope()) .StartWith(relativeTo.FindNameScope()); - var detached = Observable.FromEventPattern( - x => relativeTo.DetachedFromVisualTree += x, - x => relativeTo.DetachedFromVisualTree += x) + var detached = Observable.FromEventPattern( + x => relativeTo.DetachedFromLogicalTree += x, + x => relativeTo.DetachedFromLogicalTree += x) .Select(x => (INameScope)null); return attached.Merge(detached).Select(nameScope =>