Skip to content

fix: fix OnColorValuesChanged issue and using extension block. #853

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

Draft
zdpcdt wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: fix OnColorValuesChanged issue and using extension block. #853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 22 additions & 23 deletions src/Semi.Avalonia/Extensions/ApplicationExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Avalonia;
using Avalonia.Media;
Expand All @@ -10,7 +9,7 @@ namespace Semi.Avalonia;

public static class ApplicationExtension
{
private static Application _app = null!;
private static Application? _app;

private static readonly Dictionary<Color, ThemeVariant> ColorThemeMap = new()
{
Expand All @@ -20,34 +19,35 @@ public static class ApplicationExtension
[Color.Parse("#D6B4FD")] = SemiTheme.NightSky
};

public static void RegisterFollowSystemTheme(this Application app)
extension(Application app)
{
_app = app;
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
if (app.PlatformSettings is null) return;
app.PlatformSettings.ColorValuesChanged -= OnColorValuesChanged;
app.PlatformSettings.ColorValuesChanged += OnColorValuesChanged;
OnColorValuesChanged(null, app.PlatformSettings?.GetColorValues());
}
public void RegisterFollowSystemTheme()
{
_app = app;
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
if (app.PlatformSettings is null) return;
app.PlatformSettings.ColorValuesChanged -= OnColorValuesChanged;
app.PlatformSettings.ColorValuesChanged += OnColorValuesChanged;
OnColorValuesChanged(null, app.PlatformSettings?.GetColorValues());
}

public static void UnregisterFollowSystemTheme(this Application app)
{
_app = app;
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
if (app.PlatformSettings is null) return;
app.PlatformSettings.ColorValuesChanged -= OnColorValuesChanged;
public void UnregisterFollowSystemTheme()
{
_app = app;
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
if (app.PlatformSettings is null) return;
app.PlatformSettings.ColorValuesChanged -= OnColorValuesChanged;
}
}

// TODO: Temporarily remove high contrast fallback behavior until we sort out new platform color change behavior
private static void OnColorValuesChanged(object? _, PlatformColorValues? args)
{
ThemeVariant result;
if (args?.ContrastPreference is ColorContrastPreference.High)
{
result = ColorThemeMap.TryGetValue(args.AccentColor1, out var theme) ? theme : ThemeVariant.Default;
_app.RequestedThemeVariant = result;
_app?.RequestedThemeVariant = result;
}
/*
else
{
result = args?.ThemeVariant switch
Expand All @@ -57,8 +57,7 @@ private static void OnColorValuesChanged(object? _, PlatformColorValues? args)
_ => ThemeVariant.Default
};
}

_app.RequestedThemeVariant = result;
*/

_app?.RequestedThemeVariant = result;
}
}