diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs index d5384fc6a..471ba3bfc 100644 --- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs +++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs @@ -595,7 +595,7 @@ private void OnTemplateButtonClick(TitleBarButtonType buttonType) } /// - /// Listening window hooks after rendering window content to SizeToContent support + /// Listening window hooks after rendering window content to SizeToContent support /// private void OnWindowContentRendered(object? sender, EventArgs e) { @@ -607,8 +607,17 @@ private void OnWindowContentRendered(object? sender, EventArgs e) window.ContentRendered -= OnWindowContentRendered; IntPtr handle = new WindowInteropHelper(window).Handle; - HwndSource windowSource = - HwndSource.FromHwnd(handle) ?? throw new InvalidOperationException("Window source is null"); + if (handle == IntPtr.Zero) + { + return; + } + + HwndSource? windowSource = HwndSource.FromHwnd(handle); + if (windowSource == null) + { + return; + } + windowSource.AddHook(HwndSourceHook); }