diff --git a/src/MaterialDesignThemes.Wpf/DialogHost.cs b/src/MaterialDesignThemes.Wpf/DialogHost.cs index f0b39e45b9..a077b2f3ca 100644 --- a/src/MaterialDesignThemes.Wpf/DialogHost.cs +++ b/src/MaterialDesignThemes.Wpf/DialogHost.cs @@ -1022,7 +1022,7 @@ private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs) } } - private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) + private void Register() { foreach (var weakRef in LoadedInstances.ToList()) { @@ -1033,6 +1033,11 @@ private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) } LoadedInstances.Add(new WeakReference(this)); + } + + private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) + { + Register(); if (IsOpen && _popup is { } popup) { @@ -1044,6 +1049,12 @@ private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) } } + protected override void OnInitialized(EventArgs e) + { + base.OnInitialized(e); + Register(); + } + [SecurityCritical] [DllImport("user32.dll", EntryPoint = "SetFocus", SetLastError = true)] private static extern IntPtr SetFocus(IntPtr hWnd); diff --git a/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml new file mode 100644 index 0000000000..540845b89d --- /dev/null +++ b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml @@ -0,0 +1,13 @@ + + + diff --git a/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml.cs b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml.cs new file mode 100644 index 0000000000..13e8ffc661 --- /dev/null +++ b/tests/MaterialDesignThemes.UITests/Samples/DialogHost/OpenDialogInConstructorWindow.xaml.cs @@ -0,0 +1,13 @@ +namespace MaterialDesignThemes.UITests.Samples.DialogHost; + +/// +/// Interaction logic for OpenDialogInConstructorWindow.xaml +/// +public partial class OpenDialogInConstructorWindow : Window +{ + public OpenDialogInConstructorWindow() + { + InitializeComponent(); + MaterialDesignThemes.Wpf.DialogHost.Show("Dialog opened in constructor"); + } +} diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs index fa84783942..7fd4e36f3d 100644 --- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs +++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs @@ -665,6 +665,18 @@ public async Task DialogHost_FocusMovedInsideDialogWhileOpening_IsKept(string di } } + [Test] + [DoesNotRequireInteraction] + [Description("Issue 3804")] + public async Task DialogHost_CanOpenDialog_FromWindowConstructor() + { + await App.InitializeWithMaterialDesign(); + IWindow window = await App.CreateWindow(); + var dialogHost = await window.GetElement(); + + await Assert.That(await dialogHost.GetIsOpen()).IsTrue(); + } + private static object SetDialogHostStyle(DialogHost dialogHost, string styleName) { var style = (Style)dialogHost.FindResource(styleName);