Browse Source

Move check to avalonia properties.

pull/3258/head
Steven Kirk 6 years ago
parent
commit
e404544596
  1. 5
      src/Avalonia.Base/AvaloniaPropertyRegistry.cs
  2. 17
      src/Avalonia.Base/DirectPropertyBase.cs
  3. 17
      src/Avalonia.Base/StyledPropertyBase.cs

5
src/Avalonia.Base/AvaloniaPropertyRegistry.cs

@ -448,11 +448,6 @@ namespace Avalonia
foreach (PropertyInitializationData data in initializationData) foreach (PropertyInitializationData data in initializationData)
{ {
if (!data.Property.HasNotifyInitializedObservers)
{
continue;
}
data.Property.NotifyInitialized(o); data.Property.NotifyInitialized(o);
} }
} }

17
src/Avalonia.Base/DirectPropertyBase.cs

@ -104,13 +104,16 @@ namespace Avalonia
/// <inheritdoc/> /// <inheritdoc/>
internal override void NotifyInitialized(IAvaloniaObject o) internal override void NotifyInitialized(IAvaloniaObject o)
{ {
var e = new AvaloniaPropertyChangedEventArgs<TValue>( if (HasNotifyInitializedObservers)
o, {
this, var e = new AvaloniaPropertyChangedEventArgs<TValue>(
default, o,
InvokeGetter(o), this,
BindingPriority.Unset); default,
NotifyInitialized(e); InvokeGetter(o),
BindingPriority.Unset);
NotifyInitialized(e);
}
} }
/// <inheritdoc/> /// <inheritdoc/>

17
src/Avalonia.Base/StyledPropertyBase.cs

@ -141,13 +141,16 @@ namespace Avalonia
/// <inheritdoc/> /// <inheritdoc/>
internal override void NotifyInitialized(IAvaloniaObject o) internal override void NotifyInitialized(IAvaloniaObject o)
{ {
var e = new AvaloniaPropertyChangedEventArgs<TValue>( if (HasNotifyInitializedObservers)
o, {
this, var e = new AvaloniaPropertyChangedEventArgs<TValue>(
default, o,
o.GetValue(this), this,
BindingPriority.Unset); default,
NotifyInitialized(e); o.GetValue(this),
BindingPriority.Unset);
NotifyInitialized(e);
}
} }
/// <inheritdoc/> /// <inheritdoc/>

Loading…
Cancel
Save