From 1f5560a8a82b5ccc7d5eed756e7aadcf07446789 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 29 Mar 2022 16:06:57 +0200
Subject: [PATCH] feat(DevTools): Open DevTools with Focused Element
 Automatically Selected in Tree

---
 src/Avalonia.Diagnostics/Diagnostics/DevTools.cs       |  8 +++++---
 .../Diagnostics/Views/MainWindow.xaml.cs               | 10 +++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
index 683c2e6549..fad4d3146a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
@@ -105,13 +105,15 @@ namespace Avalonia.Diagnostics
 
         private static IDisposable Open(Application? application, DevToolsOptions options, Window? owner = default)
         {
+            var focussedControl = KeyboardDevice.Instance?.FocusedElement as IControl;
             if (application is null)
             {
                 throw new ArgumentNullException(nameof(application));
             }
             if (s_open.TryGetValue(application, out var window))
-            {                
+            {
                 window.Activate();
+                window.SelectedControl(focussedControl);
             }
             else
             {
@@ -122,7 +124,7 @@ namespace Avalonia.Diagnostics
                     Height = options.Size.Height,
                 };
                 window.SetOptions(options);
-
+                window.SelectedControl(focussedControl);
                 window.Closed += DevToolsClosed;
                 s_open.Add(application, window);
                 if (options.ShowAsChildWindow && owner is { })
@@ -133,7 +135,7 @@ namespace Avalonia.Diagnostics
                 {
                     window.Show();
                 }
-            }
+            }           
             return Disposable.Create(() => window?.Close());
         }
     }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 1e152dcdd4..7abe2570e3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -110,7 +110,7 @@ namespace Avalonia.Diagnostics.Views
         {
 #pragma warning disable CS0618 // Type or member is obsolete
             var point = (topLevel as IInputRoot)?.MouseDevice?.GetPosition(topLevel) ?? default;
-#pragma warning restore CS0618 // Type or member is obsolete                
+#pragma warning restore CS0618 // Type or member is obsolete
 
             return (IControl?)topLevel.GetVisualsAt(point, x =>
                 {
@@ -255,5 +255,13 @@ namespace Avalonia.Diagnostics.Views
                 }                
             }
         }
+
+        internal void SelectedControl(IControl? control)
+        {
+            if (control is { })
+            {
+                (DataContext as MainViewModel)?.SelectControl(control);
+            }
+        }
     }
 }