Skip to content

Fix Content Dialog owner & Fix Win32Exception #3466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2025
Merged

Fix Content Dialog owner & Fix Win32Exception #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f839689
Add Content Dialog owner
onesounds Apr 14, 2025
9035aa6
Fix dialog owner for all content dialog
Jack251970 Apr 15, 2025
28c7538
Fix possible Win32Exception
Jack251970 Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions Flow.Launcher.Infrastructure/Win32Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
12 changes: 8 additions & 4 deletions Flow.Launcher/HotkeyControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,6 +7,8 @@
using Flow.Launcher.Infrastructure.Hotkey;
using Flow.Launcher.Infrastructure.UserSettings;

#nullable enable

namespace Flow.Launcher
{
public partial class HotkeyControl
Expand Down Expand Up @@ -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)
{
Expand Down
3 changes: 1 addition & 2 deletions Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -116,6 +115,7 @@ private async Task OpenHelperAsync()
{
var helpDialog = new ContentDialog()
{
Owner = Application.Current.MainWindow,
Content = new StackPanel
{
Children =
Expand Down Expand Up @@ -146,7 +146,6 @@ private async Task OpenHelperAsync()
}
}
},

PrimaryButtonText = (string)Application.Current.Resources["commonOK"],
CornerRadius = new CornerRadius(8),
Style = (Style)Application.Current.Resources["ContentDialog"]
Expand Down
Loading