Browse Source

ClearLocalValue => ClearValue.

It no longer just clears the local value, and the method on `AvaloniaObject` is called simply `ClearValue` so makes sense to use the same naming here.
pull/10324/head
Steven Kirk 4 years ago
parent
commit
15a0fd6a3f
  1. 8
      src/Avalonia.Base/AvaloniaObject.cs
  2. 4
      src/Avalonia.Base/PropertyStore/ValueStore.cs

8
src/Avalonia.Base/AvaloniaObject.cs

@ -118,7 +118,7 @@ namespace Avalonia
{
_ = property ?? throw new ArgumentNullException(nameof(property));
VerifyAccess();
_values.ClearLocalValue(property);
_values.ClearValue(property);
}
/// <summary>
@ -152,7 +152,7 @@ namespace Avalonia
property = property ?? throw new ArgumentNullException(nameof(property));
VerifyAccess();
_values.ClearLocalValue(property);
_values.ClearValue(property);
}
/// <summary>
@ -329,7 +329,7 @@ namespace Avalonia
if (value is UnsetValueType)
{
if (priority == BindingPriority.LocalValue)
_values.ClearLocalValue(property);
_values.ClearValue(property);
}
else if (value is not DoNothingType)
{
@ -398,7 +398,7 @@ namespace Avalonia
if (value is UnsetValueType)
{
_values.ClearLocalValue(property);
_values.ClearValue(property);
}
else if (value is not DoNothingType)
{

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

@ -155,7 +155,7 @@ namespace Avalonia.PropertyStore
return observer;
}
public void ClearLocalValue(AvaloniaProperty property)
public void ClearValue(AvaloniaProperty property)
{
if (TryGetEffectiveValue(property, out var effective) &&
(effective.Priority == BindingPriority.LocalValue || effective.IsOverridenCurrentValue))
@ -499,7 +499,7 @@ namespace Avalonia.PropertyStore
if (existing == observer)
{
_localValueBindings?.Remove(property.Id);
ClearLocalValue(property);
ClearValue(property);
}
}
}

Loading…
Cancel
Save