From 59d499fee42151610911201e8355d68a6d4e3d72 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 12 Nov 2016 17:45:02 +0000
Subject: [PATCH] ItemsControl ensure Containers Templated parent is null.

---
 src/Avalonia.Controls/ItemsControl.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 581b8d8052..9442eb908e 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -229,8 +229,6 @@ namespace Avalonia.Controls
         /// <param name="e">The details of the containers.</param>
         protected virtual void OnContainersMaterialized(ItemContainerEventArgs e)
         {
-            var toAdd = new List<ILogical>();
-
             foreach (var container in e.Containers)
             {
                 // If the item is its own container, then it will be added to the logical tree when
@@ -244,7 +242,8 @@ namespace Avalonia.Controls
                         if (containerControl != null && containerControl is ILogical)
                         {
                             containerControl.UpdateChild();
-                            toAdd.Add(containerControl.Child as ILogical);
+                            LogicalChildren.Add(containerControl.Child as ILogical);
+                            containerControl.SetValue(TemplatedParentProperty, null);
                         }
                         else
                         {
@@ -253,12 +252,10 @@ namespace Avalonia.Controls
                     }
                     else
                     {
-                        toAdd.Add(container.ContainerControl);
+                        LogicalChildren.Add(container.ContainerControl);
                     }
                 }
             }
-
-            LogicalChildren.AddRange(toAdd);
         }
 
         /// <summary>