Fix shell plugin focus issue

Flow.Launcher.Infrastructure/NativeMethods.txt

@@ -86,4 +86,13 @@ EVENT_OBJECT_HIDE
 EVENT_SYSTEM_DIALOGEND
 
 WM_POWERBROADCAST
-PBT_APMRESUMEAUTOMATIC
+PBT_APMRESUMEAUTOMATIC
+
+SetForegroundWindow
+GetForegroundWindow
+GetCurrentThreadId
+GetWindowThreadProcessId
+AttachThreadInput
+SetWindowPos
+SetFocus
+SetActiveWindow

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -18,7 +18,7 @@
 using Microsoft.Win32.SafeHandles;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.System.Threading;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.Shell.Common;
@@ -43,7 +43,7 @@
         {
             var cloaked = cloak ? 1 : 0;
 
             return PInvoke.DwmSetWindowAttribute(
                 GetWindowHandle(window),
                 DWMWINDOWATTRIBUTE.DWMWA_CLOAK,
                 &cloaked,
@@ -54,13 +54,13 @@
         {
             var backdropType = backdrop switch
             {
                 BackdropTypes.Acrylic => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TRANSIENTWINDOW,
                 BackdropTypes.Mica => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_MAINWINDOW,
                 BackdropTypes.MicaAlt => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TABBEDWINDOW,
                 _ => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_AUTO
             };
 
             return PInvoke.DwmSetWindowAttribute(
                 GetWindowHandle(window),
                 DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE,
                 &backdropType,
@@ -151,6 +151,40 @@
             return handle.Equals(PInvoke.GetForegroundWindow());
         }
 
+        /// <summary>
+        /// Brings the window to foreground if window is visible. From https://github.com/files-community/Files.
+        /// </summary>
+        /// <remarks>
+        /// For more information, visit
+        /// <br/>
+        /// - <a href="https://stackoverflow.com/questions/1544179/what-are-the-differences-between-bringwindowtotop-setforegroundwindow-setwindo" />
+        /// <br/>
+        /// - <a href="https://stackoverflow.com/questions/916259/win32-bring-a-window-to-top" />
+        /// </remarks>
+        /// <param name="window">The window to bring.</param>
+        public static unsafe void BringToForegroundEx(Window window)
+        {
+            var hWnd = GetWindowHandle(window);
+            var topMost = window.Topmost;
+            var hCurWnd = PInvoke.GetForegroundWindow();
+            var dwMyID = PInvoke.GetCurrentThreadId();
+            var dwCurID = PInvoke.GetWindowThreadProcessId(hCurWnd);
+
+            PInvoke.AttachThreadInput(dwCurID, dwMyID, true);
+
+            // Set the window to be the topmost window
+            PInvoke.SetWindowPos(hWnd, (HWND)(-1), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
+            if (!topMost)
+            {
+                // Restore the window to its original position
+                PInvoke.SetWindowPos(hWnd, (HWND)(-2), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_SHOWWINDOW | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOMOVE);
+            }
+            PInvoke.SetForegroundWindow(hWnd);
+            PInvoke.SetFocus(hWnd);
+            PInvoke.SetActiveWindow(hWnd);
+            PInvoke.AttachThreadInput(dwCurID, dwMyID, false);
+        }
+
         #endregion
 
         #region Task Switching

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -2249,6 +2249,7 @@ public void FocusQueryTextBox()
                 // When application is exiting, the Application.Current will be null
                 if (Application.Current?.MainWindow is MainWindow window)
                 {
+                    Win32Helper.BringToForegroundEx(window);
                     window.QueryTextBox.Focus();
                     Keyboard.Focus(window.QueryTextBox);
                 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -412,11 +412,11 @@ private void OnWinRPressed()
             _ = Task.Run(async () =>
             {
                 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);
+                await Task.Delay(1000);
                 Context.API.FocusQueryTextBox();
             });
         }