Browse Source

Move check to avalonia properties.

Steven Kirk 6 years ago
parent
commit
e404544596

+ 0 - 5
src/Avalonia.Base/AvaloniaPropertyRegistry.cs

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

+ 10 - 7
src/Avalonia.Base/DirectPropertyBase.cs

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

+ 10 - 7
src/Avalonia.Base/StyledPropertyBase.cs

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