Browse Source

Set TemplatedParentProperty null before calling update child

so it doesnt end up seting the ItemsControls parent as the container.childs parent.
Preventing it being removed from logical tree.
pull/799/head
Dan Walmsley 10 years ago
parent
commit
bcc6cc196c
  1. 5
      src/Avalonia.Controls/ItemsControl.cs

5
src/Avalonia.Controls/ItemsControl.cs

@ -242,14 +242,14 @@ namespace Avalonia.Controls
if (containerControl != null)
{
((ISetLogicalParent)containerControl).SetParent(this);
containerControl.SetValue(TemplatedParentProperty, null);
containerControl.UpdateChild();
if (containerControl.Child is ILogical)
{
LogicalChildren.Add(containerControl.Child as ILogical);
}
containerControl.SetValue(TemplatedParentProperty, null);
}
else
{
@ -286,6 +286,7 @@ namespace Avalonia.Controls
if (containerControl != null && containerControl.Child is ILogical)
{
toRemove.Add(containerControl.Child as ILogical);
((ISetLogicalParent)containerControl).SetParent(null);
}
else
{

Loading…
Cancel
Save