Browse Source
Merge pull request #3575 from AvaloniaUI/fixes/3466-animation-overrides-localvalue
Make animation value override local value
pull/3581/head
Jumar Macato
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
12 additions and
0 deletions
-
src/Avalonia.Base/ValueStore.cs
-
tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
|
|
|
@ -232,6 +232,7 @@ namespace Avalonia |
|
|
|
else |
|
|
|
{ |
|
|
|
var priorityValue = new PriorityValue<T>(_owner, property, this, l); |
|
|
|
priorityValue.SetValue(value, priority); |
|
|
|
_values.SetValue(property, priorityValue); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -240,6 +240,17 @@ namespace Avalonia.Base.UnitTests |
|
|
|
Assert.Equal("two", target.GetValue(Class1.FooProperty)); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void SetValue_Animation_Overrides_LocalValue() |
|
|
|
{ |
|
|
|
Class1 target = new Class1(); |
|
|
|
|
|
|
|
target.SetValue(Class1.FooProperty, "one", BindingPriority.LocalValue); |
|
|
|
Assert.Equal("one", target.GetValue(Class1.FooProperty)); |
|
|
|
target.SetValue(Class1.FooProperty, "two", BindingPriority.Animation); |
|
|
|
Assert.Equal("two", target.GetValue(Class1.FooProperty)); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void Setting_UnsetValue_Reverts_To_Default_Value() |
|
|
|
{ |
|
|
|
|