Browse Source

Fix value re-evaluation with SetCurrentValue.

`SetCurrentValue`'s value was being discarded if a style with more than one setter was was re-evaluated as `ValueStore.ReevaluationEffectiveValues` removed the effective value.
pull/10497/head
Steven Kirk 4 years ago
parent
commit
d84f8225be
  1. 2
      src/Avalonia.Base/PropertyStore/ValueStore.cs

2
src/Avalonia.Base/PropertyStore/ValueStore.cs

@ -924,7 +924,7 @@ namespace Avalonia.PropertyStore
{
_effectiveValues.GetKeyValue(i, out var key, out var e);
if (e.Priority == BindingPriority.Unset)
if (e.Priority == BindingPriority.Unset && !e.IsOverridenCurrentValue)
{
RemoveEffectiveValue(key, i);
e.DisposeAndRaiseUnset(this, key);

Loading…
Cancel
Save