Skip to content

fix(controls): unhook event on closed fluentwindow #1682

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
pomianowski merged 2 commits into from
Apr 17, 2026
Merged

fix(controls): unhook event on closed fluentwindow #1682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
566c7d1
unhook event on closed window
dkuaf Apr 7, 2026
4d68ff9
Apply suggestions from code review
dkuaf Apr 9, 2026
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
23 changes: 16 additions & 7 deletions src/Wpf.Ui/Controls/FluentWindow/FluentWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,7 @@ public FluentWindow()

if (Utilities.IsOSWindows11OrNewer)
{
ApplicationThemeManager.Changed += (_, _) =>
{
if (IsActive && ApplicationAccentColorManager.IsAccentColorOnTitleBarsEnabled)
{
UnsafeNativeMethods.ApplyBorderColor(this, ApplicationAccentColorManager.SystemAccent);
}
};
ApplicationThemeManager.Changed += OnApplicationThemeManagerChanged;
}
}

Expand All @@ -113,6 +107,21 @@ static FluentWindow()
);
}

private void OnApplicationThemeManagerChanged(ApplicationTheme currentApplicationTheme, Color systemAccent)
{
if (IsActive && ApplicationAccentColorManager.IsAccentColorOnTitleBarsEnabled)
{
UnsafeNativeMethods.ApplyBorderColor(this, ApplicationAccentColorManager.SystemAccent);
}
}

/// <inheritdoc />
protected override void OnClosed(EventArgs e)
{
ApplicationThemeManager.Changed -= OnApplicationThemeManagerChanged;
base.OnClosed(e);
}

/// <inheritdoc />
protected override void OnSourceInitialized(EventArgs e)
{
Expand Down
Loading