Skip to content
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

Jump to bottom

fix(StatusBar): OS theme change no longer crashes app #867

Merged
merged 2 commits into from
Oct 16, 2023
Merged

fix(StatusBar): OS theme change no longer crashes app #867

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1507bfb
fix(StatusBar): OS theme change no longer crashes app
silviuo Oct 10, 2023
ad6b416
chore: added Windows-specific conditional
silviuo Oct 16, 2023
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
24 changes: 15 additions & 9 deletions src/Uno.Toolkit.UI/Behaviors/StatusBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,21 @@ private static void OnUISettingsColorValuesChanged(UISettings sender, object arg
{
if (_lastActivePage is { } page)
{
if (GetSubscription(page) != null &&
GetForeground(page) is StatusBarForegroundTheme.Auto or StatusBarForegroundTheme.AutoInverse &&
GetSystemTheme() is var theme && theme != _lastAppliedTheme)
{
// this will prevent deadlock, as setting the XamlStatusBar.Foreground will trigger ColorValuesChanged
_lastAppliedTheme = theme;

UpdateStatusBar(page);
}
#if !HAS_UNO
page.GetDispatcherCompat().Schedule(() => {
silviuo marked this conversation as resolved.
Show resolved Hide resolved
#endif
if (GetSubscription(page) != null &&
GetForeground(page) is StatusBarForegroundTheme.Auto or StatusBarForegroundTheme.AutoInverse &&
GetSystemTheme() is var theme && theme != _lastAppliedTheme)
{
// this will prevent deadlock, as setting the XamlStatusBar.Foreground will trigger ColorValuesChanged
_lastAppliedTheme = theme;

UpdateStatusBar(page);
}
#if !HAS_UNO
});
#endif
}
}

Expand Down
Loading