From 54bc9ddeeb87cfd3ad0164728b52633a9bba7b37 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Dec 2022 11:03:03 +0100
Subject: [PATCH] Fix adorners in DevTools.

---
 .../Diagnostics/Views/TreePageView.xaml       |  4 ++-
 .../Diagnostics/Views/TreePageView.xaml.cs    | 26 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index 36bb880a14..3ca3d0b60e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -11,7 +11,9 @@
       <TreeView.DataTemplates>
         <TreeDataTemplate DataType="vm:TreeNode"
                           ItemsSource="{Binding Children}">
-          <StackPanel Orientation="Horizontal" Spacing="8">
+          <StackPanel Orientation="Horizontal" Spacing="8"
+                      PointerEntered="AddAdorner"
+                      PointerExited="RemoveAdorner">
             <TextBlock Text="{Binding Type}" FontWeight="{Binding FontWeight}"/>
             <TextBlock Text="{Binding Classes}"/>
             <TextBlock Foreground="Gray" Text="{Binding ElementName}"/>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
index d8feb579f0..1a4bb6170a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -21,7 +21,6 @@ namespace Avalonia.Diagnostics.Views
         {
             InitializeComponent();
             _tree = this.GetControl<TreeView>("tree");
-            ////_tree.ItemContainerGenerator.Index!.Materialized += TreeViewItemMaterialized;
 
             _adorner = new Panel
             {
@@ -102,30 +101,5 @@ namespace Avalonia.Diagnostics.Views
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-        ////private void TreeViewItemMaterialized(object? sender, ItemContainerEventArgs e)
-        ////{
-        ////    var item = (TreeViewItem)e.Containers[0].ContainerControl;
-        ////    item.TemplateApplied += TreeViewItemTemplateApplied;
-        ////}
-
-        private void TreeViewItemTemplateApplied(object? sender, TemplateAppliedEventArgs e)
-        {
-            var item = (TreeViewItem)sender!;
-
-            // This depends on the default tree item template.
-            // We want to handle events in the item header but exclude events coming from children.
-            var header = item.FindDescendantOfType<Border>();
-
-            Debug.Assert(header != null);
-
-            if (header != null)
-            {
-                header.PointerEntered += AddAdorner;
-                header.PointerExited += RemoveAdorner;
-            }
-
-            item.TemplateApplied -= TreeViewItemTemplateApplied;
-        }
     }
 }