Move check to avalonia properties.

6 years ago · e404544596
3 changed files with 20 additions and 19 deletions
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/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);
            }
        }
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/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/>
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/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/>