Skip to content

Commit 9035aa6

Browse files
committed
Fix dialog owner for all content dialog
1 parent f839689 commit 9035aa6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Flow.Launcher/HotkeyControl.xaml.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#nullable enable
2-
3-
using System.Collections.ObjectModel;
1+
using System.Collections.ObjectModel;
42
using System.Threading.Tasks;
53
using System.Windows;
64
using System.Windows.Input;
@@ -9,6 +7,8 @@
97
using Flow.Launcher.Infrastructure.Hotkey;
108
using Flow.Launcher.Infrastructure.UserSettings;
119

10+
#nullable enable
11+
1212
namespace Flow.Launcher
1313
{
1414
public partial class HotkeyControl
@@ -242,9 +242,10 @@ private async Task OpenHotkeyDialogAsync()
242242
HotKeyMapper.RemoveHotkey(Hotkey);
243243
}
244244

245-
var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle);
246-
247-
dialog.Owner = Window.GetWindow(this);
245+
var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle)
246+
{
247+
Owner = Window.GetWindow(this)
248+
};
248249

249250
await dialog.ShowAsync();
250251
switch (dialog.ResultType)

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Windows;
66
using CommunityToolkit.Mvvm.Input;
77
using Flow.Launcher.Core.Plugin;
8-
using Flow.Launcher.Infrastructure;
98
using Flow.Launcher.Infrastructure.UserSettings;
109
using Flow.Launcher.Plugin;
1110
using Flow.Launcher.ViewModel;
@@ -116,6 +115,7 @@ private async Task OpenHelperAsync()
116115
{
117116
var helpDialog = new ContentDialog()
118117
{
118+
Owner = Application.Current.MainWindow,
119119
Content = new StackPanel
120120
{
121121
Children =
@@ -146,7 +146,6 @@ private async Task OpenHelperAsync()
146146
}
147147
}
148148
},
149-
150149
PrimaryButtonText = (string)Application.Current.Resources["commonOK"],
151150
CornerRadius = new CornerRadius(8),
152151
Style = (Style)Application.Current.Resources["ContentDialog"]

0 commit comments

Comments
 (0)