mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Fix dialog owner for all content dialog
This commit is contained in:
parent
f839689294
commit
9035aa6fab
2 changed files with 8 additions and 8 deletions
|
|
@ -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.Helper;
|
|||
using Flow.Launcher.Infrastructure.Hotkey;
|
||||
using Flow.Launcher.Infrastructure.UserSettings;
|
||||
|
||||
#nullable enable
|
||||
|
||||
namespace Flow.Launcher
|
||||
{
|
||||
public partial class HotkeyControl
|
||||
|
|
@ -242,9 +242,10 @@ namespace Flow.Launcher
|
|||
HotKeyMapper.RemoveHotkey(Hotkey);
|
||||
}
|
||||
|
||||
var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle);
|
||||
|
||||
dialog.Owner = Window.GetWindow(this);
|
||||
var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle)
|
||||
{
|
||||
Owner = Window.GetWindow(this)
|
||||
};
|
||||
|
||||
await dialog.ShowAsync();
|
||||
switch (dialog.ResultType)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using System.Windows.Controls;
|
|||
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 @@ public partial class SettingsPanePluginsViewModel : BaseModel
|
|||
{
|
||||
var helpDialog = new ContentDialog()
|
||||
{
|
||||
Owner = Application.Current.MainWindow,
|
||||
Content = new StackPanel
|
||||
{
|
||||
Children =
|
||||
|
|
@ -146,7 +146,6 @@ public partial class SettingsPanePluginsViewModel : BaseModel
|
|||
}
|
||||
}
|
||||
},
|
||||
|
||||
PrimaryButtonText = (string)Application.Current.Resources["commonOK"],
|
||||
CornerRadius = new CornerRadius(8),
|
||||
Style = (Style)Application.Current.Resources["ContentDialog"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue