Merge pull request #3568 from onesounds/20250522-FixWinR

Fix: Ensure QueryTextBox receives focus after Win+R

Author: Jack251970

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -88,6 +88,11 @@ public interface IPublicAPI
         /// Show the MainWindow when hiding
         /// </summary>
         void ShowMainWindow();
+        
+        /// <summary>
+        /// Focus the query text box in the main window
+        /// </summary>
+        void FocusQueryTextBox();
 
         /// <summary>
         /// Hide MainWindow

Flow.Launcher/PublicAPIInstance.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -10,6 +11,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Input;
 using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core;
@@ -32,7 +34,6 @@
 using JetBrains.Annotations;
 using Squirrel;
 using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
-using System.ComponentModel;
 
 namespace Flow.Launcher
 {
@@ -93,6 +94,8 @@ public async void RestartApp()
 
         public void ShowMainWindow() => _mainVM.Show();
 
+        public void FocusQueryTextBox() => _mainVM.FocusQueryTextBox();
+
         public void HideMainWindow() => _mainVM.Hide();
 
         public bool IsMainWindowVisible() => _mainVM.MainWindowVisibilityStatus;

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1926,6 +1926,21 @@ public void UpdateResultView(ICollection<ResultsForUpdate> resultsForUpdates)
             Results.AddResults(resultsForUpdates, token, reSelect);
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>")]
+        public void FocusQueryTextBox()
+        {
+            // When application is exiting, the Application.Current will be null
+            Application.Current?.Dispatcher.Invoke(() =>
+            {
+                // When application is exiting, the Application.Current will be null
+                if (Application.Current?.MainWindow is MainWindow window)
+                {
+                    window.QueryTextBox.Focus();
+                    Keyboard.Focus(window.QueryTextBox);
+                }
+            });
+        }
+
         #endregion
 
         #region IDisposable

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

@@ -378,11 +378,17 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
 
         private void OnWinRPressed()
         {
+            Context.API.ShowMainWindow();
             // show the main window and set focus to the query box
-            _ = Task.Run(() =>
+            _ = Task.Run(async () =>
             {
-                Context.API.ShowMainWindow();
                 Context.API.ChangeQuery($"{Context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");
+
+                // Win+R is a system-reserved shortcut, and though the plugin intercepts the keyboard event and
+                // shows the main window, Windows continues to process the Win key and briefly reclaims focus.
+                // So we need to wait until the keyboard event processing is completed and then set focus
+                await Task.Delay(50);
+                Context.API.FocusQueryTextBox();
             });
         }