Merge pull request #6702 from YohDeadfall/fix-dev-tools-events

Fixed handled event misses in dev tools
AvaloniaUI · Oct 26, 2021 · df77f18 · df77f18
1 parent 3bc719f
commit df77f18
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
@@ -29,7 +29,7 @@ public string HandlerName
             }
         }
 
-        public bool Handled { get; }
+        public bool Handled { get; set; }
 
         public RoutingStrategies Route { get; }
     }

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
@@ -55,6 +55,8 @@ private void UpdateTracker()
 
                 // FIXME: This leaks event handlers.
                 Event.AddClassHandler(typeof(object), HandleEvent, allRoutes, handledEventsToo: true);
+                Event.RouteFinished.Subscribe(HandleRouteFinished);
+
                 _isRegistered = true;
             }
         }
@@ -92,6 +94,30 @@ void handler()
             else
                 handler();
         }
+
+        private void HandleRouteFinished(RoutedEventArgs e)
+        {
+            if (!_isRegistered || IsEnabled == false)
+                return;
+            if (e.Source is IVisual v && BelongsToDevTool(v))
+                return;
+
+            var s = e.Source;
+            var handled = e.Handled;
+            var route = e.Route;
+
+            void handler()
+            {
+                if (_currentEvent != null && handled)
+                {
+                    var linkIndex = _currentEvent.EventChain.Count - 1;
+                    var link = _currentEvent.EventChain[linkIndex];
+
+                    link.Handled = true;
+                    _currentEvent.HandledBy = link;
+                }
+            }
+        }
 
         private static bool BelongsToDevTool(IVisual v)
         {

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
@@ -63,15 +63,16 @@ public void AddToChain(EventChainLink link)
         {
             if (EventChain.Count > 0)
             {
-                var prevLink = EventChain[EventChain.Count-1];
-
+                var prevLink = EventChain[EventChain.Count - 1];
+                
                 if (prevLink.Route != link.Route)
                 {
                     link.BeginsNewRoute = true;
                 }
             }
 
             EventChain.Add(link);
+
             if (HandledBy == null && link.Handled)
                 HandledBy = link;
         }