Fix: Ensure QueryTextBox receives focus after Win+R & new FocusQueryTextBox api function

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -88,6 +88,11 @@
         /// Show the MainWindow when hiding
         /// </summary>
         void ShowMainWindow();
+
+        /// <summary>
+        /// Focus the query text box in the main window
+        /// </summary>
+        void FocusQueryTextBox();
 
         /// <summary>
         /// Hide MainWindow
@@ -202,7 +207,7 @@
         Task<string> HttpGetStringAsync(string url, CancellationToken token = default);
 
         /// <summary>
         /// Http download the spefic url and return as stream
         /// </summary>
         /// <param name="url">URL to call Http Get</param>
         /// <param name="token">Cancellation Token</param>
@@ -343,7 +348,7 @@
 
         /// <summary>
         /// Reloads the query.
         /// When current results are from context menu or history, it will go back to query results before requerying.
         /// </summary>
         /// <param name="reselect">Choose the first result after reload if true; keep the last selected result if false. Default is true.</param>
         public void ReQuery(bool reselect = true);

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
 {
@@ -49,7 +50,7 @@
 
         // Must use getter to avoid circular dependency
         private Updater _updater;
         private Updater Updater => _updater ??= Ioc.Default.GetRequiredService<Updater>();
 
         private readonly object _saveSettingsLock = new();
 
@@ -93,6 +94,8 @@
 
         public void ShowMainWindow() => _mainVM.Show();
 
+        public void FocusQueryTextBox() => _mainVM.FocusQueryTextBox();
+
         public void HideMainWindow() => _mainVM.Hide();
 
         public bool IsMainWindowVisible() => _mainVM.MainWindowVisibilityStatus;
@@ -145,7 +148,7 @@
             ShellCommand.Execute(startInfo);
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>")]
         public async void CopyToClipboard(string stringToCopy, bool directCopy = false, bool showDefaultNotification = true)
         {
             if (string.IsNullOrEmpty(stringToCopy))

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -69,7 +69,7 @@
             _lastQuery = new Query();
             _ignoredQueryText = null; // null as invalid value
 
             Settings = Ioc.Default.GetRequiredService<Settings>();
             Settings.PropertyChanged += (_, args) =>
             {
                 switch (args.PropertyName)
@@ -1724,7 +1724,7 @@
 
         #region Public Methods
 
 #pragma warning disable VSTHRD100 // Avoid async void methods
 
         public void Show()
         {
@@ -1842,7 +1842,7 @@
             VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = false });
         }
 
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
         /// <summary>
         /// Save history, user selected records and top most records
@@ -1926,6 +1926,21 @@
             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

@@ -45,12 +45,12 @@
                     string basedir = null;
                     string dir = null;
                     string excmd = Environment.ExpandEnvironmentVariables(cmd);
                     if (Directory.Exists(excmd) && (cmd.EndsWith("/") || cmd.EndsWith(@"\")))
                     {
                         basedir = excmd;
                         dir = cmd;
                     }
                     else if (Directory.Exists(Path.GetDirectoryName(excmd) ?? string.Empty))
                     {
                         basedir = Path.GetDirectoryName(excmd);
                         var dirName = Path.GetDirectoryName(cmd);
@@ -378,11 +378,17 @@
 
         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();
             });
         }