From f04c9fa0b6ac791b2e20964559b8dfc6fbd0703f Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 8 Feb 2023 18:49:25 +0100
Subject: [PATCH] Dev tools: fixed wrong HandledBy for events

---
 .../Diagnostics/ViewModels/EventTreeNode.cs                     | 2 +-
 src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
index 0140281d50..785fd49983 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Diagnostics.ViewModels
                     var link = _currentEvent.EventChain[linkIndex];
 
                     link.Handled = true;
-                    _currentEvent.HandledBy = link;
+                    _currentEvent.HandledBy ??= link;
                 }
             }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index cd2e92914a..f62d8a0b79 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -29,6 +29,7 @@
 
     <Style Selector="ListBoxItem.handled" >
       <Setter Property="Background" Value="#d9ffdc" />
+      <Setter Property="Foreground" Value="Black" />
     </Style>
   </UserControl.Styles>