From 5a67237be344a1062fb198d9bc7df982a5b8f08b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 11 Dec 2019 09:32:59 +0100 Subject: [PATCH] Fix updating index when TreeView reparented. When an entire treeview is reparented, don't detach the child `TreeViewItem`s. Fixes #3328 --- .../Generators/TreeItemContainerGenerator.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs index 9200490668..22e06a40b1 100644 --- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs +++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs @@ -127,7 +127,7 @@ namespace Avalonia.Controls.Generators Index = new TreeContainerIndex(); _treeView = treeViewOwner; } - else if (Owner.IsAttachedToLogicalTree) + else { var treeView = Owner.GetSelfAndLogicalAncestors().OfType().FirstOrDefault(); @@ -138,12 +138,6 @@ namespace Avalonia.Controls.Generators _treeView = treeView; } } - else - { - Clear(); - Index = null; - _treeView = null; - } } class WrapperTreeDataTemplate : ITreeDataTemplate