holger/ModernWpfPlayground
1
0
Fork 0
mirror of https://github.com/holgerb83/ModernWpfPlayground.git synced 2025-04-19 23:03:49 +02:00
Code Issues 1 Projects 1 Releases Wiki Activity

updated to latest preview

Browse Source
This commit is contained in:
Holger Börchers 2020-05-01 21:41:05 +02:00
parent 3921ab20cf
commit 26094d25b4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App/ModernWpfPlayground.csproj
View File

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FastMember" Version="1.5.0" /> <PackageReference Include="FastMember" Version="1.5.0" />
<PackageReference Include="ModernWpfUI" Version="0.8.3" /> <PackageReference Include="ModernWpfUI" Version="0.9.0-preview.200425.2" />
<PackageReference Include="Prism.DryIoc" Version="7.2.0.1422" /> <PackageReference Include="Prism.DryIoc" Version="7.2.0.1422" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.1422" /> <PackageReference Include="Prism.Wpf" Version="7.2.0.1422" />
<PackageReference Include="YamlDotNet" Version="8.1.0" /> <PackageReference Include="YamlDotNet" Version="8.1.0" />

8
App/MvvmStuff/BaseViewModel.cs
View File

@ -14,10 +14,10 @@ namespace ModernWpfPlayground.MvvmStuff
ObjectAccessor = ObjectAccessor.Create(this); ObjectAccessor = ObjectAccessor.Create(this);
} }
private readonly Dictionary<string, object> _values = new Dictionary<string, object>(); private readonly Dictionary<string, object?> _values = new Dictionary<string, object?>();
protected readonly ObjectAccessor ObjectAccessor; protected readonly ObjectAccessor ObjectAccessor;
protected IReadOnlyDictionary<string, object> Values => _values; protected IReadOnlyDictionary<string, object?> Values => _values;
protected bool SetProperty<T>(T value, Action<T>? onChanged = null, protected bool SetProperty<T>(T value, Action<T>? onChanged = null,
[CallerMemberName] string? propertyName = null) [CallerMemberName] string? propertyName = null)
@ -25,7 +25,7 @@ namespace ModernWpfPlayground.MvvmStuff
if (propertyName == null) throw new ArgumentNullException(nameof(propertyName)); if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
if (_values.TryGetValue(propertyName, out var obj) && Equals(value, obj)) return false; if (_values.TryGetValue(propertyName, out var obj) && Equals(value, obj)) return false;
_values[propertyName] = value!; _values[propertyName] = value;
RaisePropertyChanged(propertyName); RaisePropertyChanged(propertyName);
onChanged?.Invoke(value); onChanged?.Invoke(value);
return true; return true;
@ -34,7 +34,7 @@ namespace ModernWpfPlayground.MvvmStuff
protected T GetProperty<T>(T defaultValue = default, [CallerMemberName] string? propertyName = null) protected T GetProperty<T>(T defaultValue = default, [CallerMemberName] string? propertyName = null)
{ {
if (propertyName == null) throw new ArgumentNullException(nameof(propertyName)); if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
return Values.TryGetValue(propertyName, out var obj) ? (T)obj : defaultValue; return Values.TryGetValue(propertyName, out var obj) ? (T)obj! : defaultValue;
} }
protected void ResetViewModel(Func<string, bool>? predicate = null) protected void ResetViewModel(Func<string, bool>? predicate = null)