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

feat: clean up warnings.

Browse Source
This commit is contained in:
rabbitism
2024-07-30 18:33:30 +08:00
parent e1f91f612b
commit 15fb5a2d1b
167 changed files with 473 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Ursa/Controls/ControlClassesInput/ControlClassesInput.cs
View File

@@ -1,7 +1,6 @@
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using Avalonia;
using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
@@ -9,9 +8,9 @@ namespace Ursa.Controls;
public class ControlClassesInput: TemplatedControl
{
LinkedList<List<string>> _history = new();
LinkedList<List<string>> _undoHistory = new();
private bool _disableHistory = false;
private readonly LinkedList<List<string>> _history = [];
private readonly LinkedList<List<string>> _undoHistory = [];
private bool _disableHistory;
public int CountOfHistoricalRecord { get; set; } = 10;
@@ -34,12 +33,12 @@ public class ControlClassesInput: TemplatedControl
}
private ObservableCollection<string> _targetClasses;
private ObservableCollection<string>? _targetClasses;
internal static readonly DirectProperty<ControlClassesInput, ObservableCollection<string>> TargetClassesProperty = AvaloniaProperty.RegisterDirect<ControlClassesInput, ObservableCollection<string>>(
internal static readonly DirectProperty<ControlClassesInput, ObservableCollection<string>?> TargetClassesProperty = AvaloniaProperty.RegisterDirect<ControlClassesInput, ObservableCollection<string>?>(
nameof(TargetClasses), o => o.TargetClasses, (o, v) => o.TargetClasses = v);
public ObservableCollection<string> TargetClasses
public ObservableCollection<string>? TargetClasses
{
get => _targetClasses;
set => SetAndRaise(TargetClassesProperty, ref _targetClasses, value);
@@ -53,14 +52,13 @@ public class ControlClassesInput: TemplatedControl
static ControlClassesInput()
{
TargetClassesProperty.Changed.AddClassHandler<ControlClassesInput, ObservableCollection<string>>((o,e)=>o.OnClassesChanged(e));
TargetClassesProperty.Changed.AddClassHandler<ControlClassesInput, ObservableCollection<string>?>((o,e)=>o.OnClassesChanged(e));
SourceProperty.Changed.AddClassHandler<StyledElement, ControlClassesInput?>(HandleSourceChange);
}
public ControlClassesInput()
{
TargetClasses = new ObservableCollection<string>();
//TargetClasses.CollectionChanged += InccOnCollectionChanged;
}
private List<StyledElement> _targets = new();
@@ -83,7 +81,6 @@ public class ControlClassesInput: TemplatedControl
if (newValue is null)
{
SaveHistory(new List<string>(), true);
return;
}
else
{
@@ -93,11 +90,10 @@ public class ControlClassesInput: TemplatedControl
{
incc.CollectionChanged+=InccOnCollectionChanged;
}
return;
}
}
private void InccOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
private void InccOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
if(_disableHistory) return;
SaveHistory(TargetClasses?.ToList() ?? new List<string>(), true);
@@ -123,7 +119,7 @@ public class ControlClassesInput: TemplatedControl
}
else
{
strings = _history.Last.Value;
strings = _history.Last?.Value ?? [];
}
if (!fromInput)
@@ -146,10 +142,10 @@ public class ControlClassesInput: TemplatedControl
_history.RemoveLast();
_undoHistory.AddFirst(node);
_disableHistory = true;
TargetClasses.Clear();
TargetClasses?.Clear();
foreach (var value in _history.Last.Value)
{
TargetClasses.Add(value);
TargetClasses?.Add(value);
}
_disableHistory = false;
SetClassesToTarget(false);
@@ -161,10 +157,10 @@ public class ControlClassesInput: TemplatedControl
_undoHistory.RemoveFirst();
_history.AddLast(node);
_disableHistory = true;
TargetClasses.Clear();
TargetClasses?.Clear();
foreach (var value in _history.Last.Value)
{
TargetClasses.Add(value);
TargetClasses?.Add(value);
}
_disableHistory = false;
SetClassesToTarget(false);