From 7a55e20f9813ca90251b3f39876571761d98ad3d Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 23 Jan 2015 19:42:41 +0100 Subject: [PATCH] Fix GetTemplateControls Make it return only controls that in the immediate template. Not sure why it was returning nested templated controls before. The may have been a reason but everything still seems to work like this... --- Perspex.Controls/ControlExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Perspex.Controls/ControlExtensions.cs b/Perspex.Controls/ControlExtensions.cs index e1b400365a..dd9e03c5d7 100644 --- a/Perspex.Controls/ControlExtensions.cs +++ b/Perspex.Controls/ControlExtensions.cs @@ -28,11 +28,11 @@ namespace Perspex.Controls return GetTemplateControls(control, (IVisual)control); } - public static IEnumerable GetTemplateControls(ITemplatedControl templated, IVisual parent) + private static IEnumerable GetTemplateControls(ITemplatedControl templated, IVisual parent) { IVisual visual = parent as IVisual; - foreach (var child in visual.VisualChildren.OfType().Where(x => x.TemplatedParent != null)) + foreach (var child in visual.VisualChildren.OfType().Where(x => x.TemplatedParent == templated)) { yield return child;