chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: unregister from old scope.

Browse Source
This commit is contained in:
rabbitism
2024-02-06 22:12:16 +08:00
parent b297b3f5aa
commit 95321030c8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Ursa/Controls/ThemeSelector/ThemeSelectorBase.cs
View File

@@ -40,11 +40,14 @@ public abstract class ThemeSelectorBase: TemplatedControl
private void OnTargetScopeChanged(AvaloniaPropertyChangedEventArgs<ThemeVariantScope?> args) private void OnTargetScopeChanged(AvaloniaPropertyChangedEventArgs<ThemeVariantScope?> args)
{ {
var target = args.NewValue.Value; if (args.OldValue.Value is { } oldTarget)
if (target is not null)
{ {
SyncThemeFromScope(target.ActualThemeVariant); oldTarget.ActualThemeVariantChanged -= OnScopeThemeChanged;
target.ActualThemeVariantChanged += OnScopeThemeChanged; }
if (args.NewValue.Value is { } newTarget)
{
newTarget.ActualThemeVariantChanged += OnScopeThemeChanged;
SyncThemeFromScope(newTarget.ActualThemeVariant);
} }
} }
@@ -66,7 +69,7 @@ public abstract class ThemeSelectorBase: TemplatedControl
_syncFromScope = false; _syncFromScope = false;
} }
protected internal virtual void SyncThemeFromScope(ThemeVariant? theme) protected virtual void SyncThemeFromScope(ThemeVariant? theme)
{ {
this.SelectedTheme = theme; this.SelectedTheme = theme;
} }
@@ -86,7 +89,6 @@ public abstract class ThemeSelectorBase: TemplatedControl
_scope.ActualThemeVariantChanged += OnScopeThemeChanged; _scope.ActualThemeVariantChanged += OnScopeThemeChanged;
SyncThemeFromScope(_scope.ActualThemeVariant); SyncThemeFromScope(_scope.ActualThemeVariant);
} }
if (TargetScope is not null) if (TargetScope is not null)
{ {
SyncThemeFromScope(TargetScope.ActualThemeVariant); SyncThemeFromScope(TargetScope.ActualThemeVariant);
@@ -100,7 +102,6 @@ public abstract class ThemeSelectorBase: TemplatedControl
{ {
_application.ActualThemeVariantChanged -= OnScopeThemeChanged; _application.ActualThemeVariantChanged -= OnScopeThemeChanged;
} }
if (_scope is not null) if (_scope is not null)
{ {
_scope.ActualThemeVariantChanged -= OnScopeThemeChanged; _scope.ActualThemeVariantChanged -= OnScopeThemeChanged;

2
src/Ursa/Controls/ThemeSelector/ThemeToggleButton.cs
View File

@@ -41,7 +41,7 @@ public class ThemeToggleButton: ThemeSelectorBase
SetCurrentValue(SelectedThemeProperty, newTheme.Value ? ThemeVariant.Light : ThemeVariant.Dark); SetCurrentValue(SelectedThemeProperty, newTheme.Value ? ThemeVariant.Light : ThemeVariant.Dark);
} }
protected internal override void SyncThemeFromScope(ThemeVariant? theme) protected override void SyncThemeFromScope(ThemeVariant? theme)
{ {
base.SyncThemeFromScope(theme); base.SyncThemeFromScope(theme);
PropertyHelper.SetValue(ToggleButton.IsCheckedProperty, theme == ThemeVariant.Light, _button); PropertyHelper.SetValue(ToggleButton.IsCheckedProperty, theme == ThemeVariant.Light, _button);