set focus on dialog

jinek · Dec 13, 2024 · 6872f53 · 6872f53
1 parent ad5332b
commit 6872f53
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/Consolonia.Gallery/View/XamlDialogWindow.axaml.cs b/src/Consolonia.Gallery/View/XamlDialogWindow.axaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
 using Avalonia;
+using Avalonia.Input;
 using Consolonia.Core.Controls;
 
 namespace Consolonia.Gallery.View
@@ -8,19 +10,25 @@ public partial class XamlDialogWindow : DialogWindow
         public XamlDialogWindow()
         {
             InitializeComponent();
-            AttachedToVisualTree += OnShowDialog;
+
+            AttachedToVisualTree += DialogWindowAttachedToVisualTree;
         }
 
-        private void OnShowDialog(object sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        private void DialogWindowAttachedToVisualTree(object sender, Avalonia.VisualTreeAttachmentEventArgs e)
         {
-            AttachedToVisualTree -= OnShowDialog;
-            Xaml.AttachedToVisualTree += OnButtonAttached;
+            AttachedToVisualTree -= DialogWindowAttachedToVisualTree;
+
+            var child = (InputElement)this.LogicalChildren.FirstOrDefault();
+            if (child != null)
+                child.AttachedToVisualTree += OnChildAttachedToVisualTree;
         }
 
-        private void OnButtonAttached(object sender, VisualTreeAttachmentEventArgs e)
+        private void OnChildAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
-            Xaml.AttachedToVisualTree -= OnButtonAttached;
-            Xaml.Focus();
+            var child = (InputElement)sender;
+            child.AttachedToVisualTree -= OnChildAttachedToVisualTree;
+            // Set focus to the first focusable element
+            child?.Focus();
         }
     }
 }