huanld/Speckle.Material.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nullable annotations in MaterialThemeBase and ColorZone

Browse Source
This commit is contained in:
appleneko2001
2022-07-05 10:39:17 +09:00
parent 35a8b3e85c
commit 80a84d33d5
2 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Material.Styles/Controls/ColorZone.cs
+4 -7
View File
@@ -84,9 +84,6 @@ namespace Material.Styles.Controls
var colorZone = this;
theme ??= Application.Current!.LocateMaterialTheme<MaterialTheme>();
if (theme.CurrentTheme == null)
return;
var resources = theme;
var foregroundProperty = TemplatedControl.ForegroundProperty;
@@ -157,20 +154,20 @@ namespace Material.Styles.Controls
}
}
private void SetValueInternal(AvaloniaProperty property, object value)
private void SetValueInternal(AvaloniaProperty property, object? value)
{
SetValue(property, value, BindingPriority.Style);
}
private static IBrush GetBrushResource(IResourceNode theme, string name)
private static IBrush? GetBrushResource(IResourceNode theme, string name)
{
if (!theme.TryGetResource(name, out var resource))
throw new Exception("Resource not found");
return null;
if (resource is IBrush brush)
return brush;
throw new Exception("Resource not found");
return null;
}
}
}
Material.Styles/Themes/MaterialThemeBase.cs
+12 -30
View File
@@ -45,13 +45,13 @@ namespace Material.Styles.Themes
private IResourceDictionary LoadedResourceDictionary => (Loaded as Avalonia.Styling.Styles)!.Resources;
public static readonly DirectProperty<MaterialThemeBase, ITheme?> CurrentThemeProperty =
AvaloniaProperty.RegisterDirect<MaterialThemeBase, ITheme?>(
public static readonly DirectProperty<MaterialThemeBase, ITheme> CurrentThemeProperty =
AvaloniaProperty.RegisterDirect<MaterialThemeBase, ITheme>(
nameof(CurrentTheme),
o => o.CurrentTheme,
(o, v) => o.CurrentTheme = v);
private ThemeStruct? _currentTheme;
private ThemeStruct _currentTheme;
/// <summary>
/// Get or set current applied theme
@@ -59,43 +59,25 @@ namespace Material.Styles.Themes
/// <returns>
/// Returns a STRUCT implementing ITheme interface
/// </returns>
public ITheme? CurrentTheme
public ITheme CurrentTheme
{
get
{
if (!_currentTheme.HasValue)
return null;
return new ThemeStruct(_currentTheme.Value);
}
get => new ThemeStruct(_currentTheme);
set
{
if (!_currentTheme.HasValue && value == null)
return;
var oldTheme = _currentTheme;
if (value != null)
{
var newTheme = new ThemeStruct(value);
var newTheme = new ThemeStruct(value);
if (oldTheme.HasValue && EqualityComparer<ITheme>.Default.Equals(oldTheme, newTheme))
return;
if (EqualityComparer<ITheme>.Default.Equals(oldTheme, newTheme))
return;
_currentTheme = newTheme;
RaisePropertyChanged(CurrentThemeProperty, oldTheme, newTheme);
StartUpdatingTheme(oldTheme, newTheme);
}
else
{
_currentTheme = null;
RaisePropertyChanged(CurrentThemeProperty, oldTheme, null);
StartUpdatingTheme(oldTheme, null);
}
_currentTheme = newTheme;
RaisePropertyChanged(CurrentThemeProperty, oldTheme, newTheme);
StartUpdatingTheme(oldTheme, newTheme);
}
}
public IObservable<ITheme?> CurrentThemeChanged => this.GetObservable(CurrentThemeProperty);
public IObservable<ITheme> CurrentThemeChanged => this.GetObservable(CurrentThemeProperty);
/// <summary>
/// This event is raised when all brushes is changed.