Merge pull request #3466 from onesounds/250415-FixDialogOwner

Fix Content Dialog owner & Fix Win32Exception

Author: onesounds

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -365,21 +365,10 @@ public static unsafe void SwitchToEnglishKeyboardLayout(bool backupPrevious)
             // No installed English layout found
             if (enHKL == HKL.Null) return;
 
-            // When application is exiting, the Application.Current will be null
-            if (Application.Current == null) return;
-
-            // Get the FL main window
-            var hwnd = GetWindowHandle(Application.Current.MainWindow, true);
+            // Get the foreground window
+            var hwnd = PInvoke.GetForegroundWindow();
             if (hwnd == HWND.Null) return;
 
-            // Check if the FL main window is the current foreground window
-            if (!IsForegroundWindow(hwnd))
-            {
-                var result = PInvoke.SetForegroundWindow(hwnd);
-                // If we cannot set the foreground window, we can use the foreground window and switch the layout
-                if (!result) hwnd = PInvoke.GetForegroundWindow();
-            }
-
             // Get the current foreground window thread ID
             var threadId = PInvoke.GetWindowThreadProcessId(hwnd);
             if (threadId == 0) throw new Win32Exception(Marshal.GetLastWin32Error());

Flow.Launcher/HotkeyControl.xaml.cs

@@ -1,6 +1,4 @@
-#nullable enable
-
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
@@ -9,6 +7,8 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
 
+#nullable enable
+
 namespace Flow.Launcher
 {
     public partial class HotkeyControl
@@ -242,7 +242,11 @@ private async Task OpenHotkeyDialogAsync()
                 HotKeyMapper.RemoveHotkey(Hotkey);
             }
 
-            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle);
+            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle)
+            {
+                Owner = Window.GetWindow(this)
+            };
+
             await dialog.ShowAsync();
             switch (dialog.ResultType)
             {

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs

@@ -5,7 +5,6 @@
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core.Plugin;
-using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
@@ -116,6 +115,7 @@ private async Task OpenHelperAsync()
     {
         var helpDialog = new ContentDialog()
         {
+            Owner = Application.Current.MainWindow,
             Content = new StackPanel
             {
                 Children =
@@ -146,7 +146,6 @@ private async Task OpenHelperAsync()
                     }
                 }
             },
-
             PrimaryButtonText = (string)Application.Current.Resources["commonOK"],
             CornerRadius = new CornerRadius(8),
             Style = (Style)Application.Current.Resources["ContentDialog"]