Merge branch 'master' into fix-dev-tools

src/Avalonia.Base/AvaloniaObject.cs

@@ -664,14 +664,12 @@ namespace Avalonia
         /// <param name="property">The property that has changed.</param>
         /// <param name="oldValue">The old property value.</param>
         /// <param name="newValue">The new property value.</param>
-        /// <param name="priority">The priority of the binding that produced the value.</param>
         protected void RaisePropertyChanged<T>(
             DirectPropertyBase<T> property,
-            Optional<T> oldValue,
-            BindingValue<T> newValue,
-            BindingPriority priority = BindingPriority.LocalValue)
+            T oldValue,
+            T newValue)
         {
-            RaisePropertyChanged(property, oldValue, newValue, priority, true);
+            RaisePropertyChanged(property, oldValue, newValue, BindingPriority.LocalValue, true);
         }
 
         /// <summary>
@@ -720,7 +718,7 @@ namespace Avalonia
         /// <returns>
         /// True if the value changed, otherwise false.
         /// </returns>
-        protected bool SetAndRaise<T>(AvaloniaProperty<T> property, ref T field, T value)
+        protected bool SetAndRaise<T>(DirectPropertyBase<T> property, ref T field, T value)
         {
             VerifyAccess();
 

src/Avalonia.Base/Data/Core/IndexerNodeBase.cs

@@ -22,7 +22,7 @@ namespace Avalonia.Data.Core
 
             if (target is INotifyPropertyChanged inpc)
             {
-                WeakEvents.PropertyChanged.Subscribe(inpc, this);
+                WeakEvents.ThreadSafePropertyChanged.Subscribe(inpc, this);
             }
             
             ValueChanged(GetValue(target));
@@ -39,7 +39,7 @@ namespace Avalonia.Data.Core
 
                 if (target is INotifyPropertyChanged inpc)
                 {
-                    WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
+                    WeakEvents.ThreadSafePropertyChanged.Unsubscribe(inpc, this);
                 }
             }
         }

src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs

@@ -160,7 +160,7 @@ namespace Avalonia.Data.Core.Plugins
                 var inpc = GetReferenceTarget() as INotifyPropertyChanged;
 
                 if (inpc != null) 
-                    WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
+                    WeakEvents.ThreadSafePropertyChanged.Unsubscribe(inpc, this);
             }
 
             private object? GetReferenceTarget()
@@ -185,7 +185,7 @@ namespace Avalonia.Data.Core.Plugins
                 var inpc = GetReferenceTarget() as INotifyPropertyChanged;
 
                 if (inpc != null) 
-                    WeakEvents.PropertyChanged.Subscribe(inpc, this);
+                    WeakEvents.ThreadSafePropertyChanged.Subscribe(inpc, this);
             }
         }
     }

src/Avalonia.Base/StyledElement.cs

@@ -524,13 +524,7 @@ namespace Avalonia
                     NotifyResourcesChanged();
                 }
 
-#nullable disable
-                RaisePropertyChanged(
-                    ParentProperty,
-                    new Optional<StyledElement>(old),
-                    new BindingValue<StyledElement>(Parent),
-                    BindingPriority.LocalValue);
-#nullable enable
+                RaisePropertyChanged(ParentProperty, old, Parent);
             }
         }
 

src/Avalonia.Base/Utilities/WeakEvents.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Windows.Input;
+using Avalonia.Threading;
 
 namespace Avalonia.Utilities;
 
@@ -20,15 +21,30 @@ public class WeakEvents
             });
     
     /// <summary>
-    /// Represents PropertyChanged event from <see cref="INotifyPropertyChanged"/>
+    /// Represents PropertyChanged event from <see cref="INotifyPropertyChanged"/> with auto-dispatching to the UI thread
     /// </summary>
     public static readonly WeakEvent<INotifyPropertyChanged, PropertyChangedEventArgs>
-        PropertyChanged = WeakEvent.Register<INotifyPropertyChanged, PropertyChangedEventArgs>(
+        ThreadSafePropertyChanged = WeakEvent.Register<INotifyPropertyChanged, PropertyChangedEventArgs>(
             (s, h) =>
             {
-                PropertyChangedEventHandler handler = (_, e) => h(s, e);
+                bool unsubscribed = false;
+                PropertyChangedEventHandler handler = (_, e) =>
+                {
+                    if (Dispatcher.UIThread.CheckAccess())
+                        h(s, e);
+                    else
+                        Dispatcher.UIThread.Post(() =>
+                        {
+                            if (!unsubscribed)
+                                h(s, e);
+                        });
+                };
                 s.PropertyChanged += handler;
-                return () => s.PropertyChanged -= handler;
+                return () =>
+                {
+                    unsubscribed = true;
+                    s.PropertyChanged -= handler;
+                };
             });
 
 

src/Avalonia.Base/Visual.cs

@@ -573,7 +573,7 @@ namespace Avalonia
         /// <param name="newParent">The new visual parent.</param>
         protected virtual void OnVisualParentChanged(Visual? oldParent, Visual? newParent)
         {
-            RaisePropertyChanged(VisualParentProperty, oldParent, newParent, BindingPriority.LocalValue);
+            RaisePropertyChanged(VisualParentProperty, oldParent, newParent);
         }
 
         internal override ParametrizedLogger? GetBindingWarningLogger(

src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@@ -345,10 +345,7 @@ namespace Avalonia.Controls.Primitives
 
                     if (_oldSelectedItems != SelectedItems)
                     {
-                        RaisePropertyChanged(
-                            SelectedItemsProperty,
-                            new Optional<IList?>(_oldSelectedItems),
-                            new BindingValue<IList?>(SelectedItems));
+                        RaisePropertyChanged(SelectedItemsProperty, _oldSelectedItems, SelectedItems);
                         _oldSelectedItems = SelectedItems;
                     }
                 }
@@ -909,10 +906,7 @@ namespace Avalonia.Controls.Primitives
             else if (e.PropertyName == nameof(InternalSelectionModel.WritableSelectedItems) &&
                      _oldSelectedItems != (Selection as InternalSelectionModel)?.SelectedItems)
             {
-                RaisePropertyChanged(
-                    SelectedItemsProperty,
-                    new Optional<IList?>(_oldSelectedItems),
-                    new BindingValue<IList?>(SelectedItems));
+                RaisePropertyChanged(SelectedItemsProperty, _oldSelectedItems, SelectedItems);
                 _oldSelectedItems = SelectedItems;
             }
             else if (e.PropertyName == nameof(ISelectionModel.Source))

src/Avalonia.Controls/RelativePanel.AttachedProperties.cs

@@ -1,37 +1,30 @@
 using Avalonia.Layout;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
     public partial class RelativePanel
     {
-        private static void OnAlignPropertiesChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e)
-        {
-            if (d is Layoutable layoutable && layoutable.Parent is Layoutable layoutableParent)
-            {
-                layoutableParent.InvalidateArrange();
-            }
-        }
 
         static RelativePanel()
         {
             ClipToBoundsProperty.OverrideDefaultValue<RelativePanel>(true);
 
-            AboveProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignBottomWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignBottomWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignHorizontalCenterWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignHorizontalCenterWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignLeftWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignLeftWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignRightWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignRightWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignTopWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignTopWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignVerticalCenterWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            AlignVerticalCenterWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            BelowProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            LeftOfProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
-            RightOfProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AffectsParentArrange<RelativePanel>(
+                AlignLeftWithPanelProperty, AlignLeftWithProperty, LeftOfProperty,
+                AlignRightWithPanelProperty, AlignRightWithProperty, RightOfProperty,
+                AlignTopWithPanelProperty, AlignTopWithProperty, AboveProperty,
+                AlignBottomWithPanelProperty, AlignBottomWithProperty, BelowProperty,
+                AlignHorizontalCenterWithPanelProperty, AlignHorizontalCenterWithProperty,
+                AlignVerticalCenterWithPanelProperty, AlignVerticalCenterWithProperty);
+            
+            AffectsParentMeasure<RelativePanel>(
+                AlignLeftWithPanelProperty, AlignLeftWithProperty, LeftOfProperty,
+                AlignRightWithPanelProperty, AlignRightWithProperty, RightOfProperty,
+                AlignTopWithPanelProperty, AlignTopWithProperty, AboveProperty,
+                AlignBottomWithPanelProperty, AlignBottomWithProperty, BelowProperty,
+                AlignHorizontalCenterWithPanelProperty, AlignHorizontalCenterWithProperty,
+                AlignVerticalCenterWithPanelProperty, AlignVerticalCenterWithProperty);
         }
 
         /// <summary>

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs

@@ -121,7 +121,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         {
             if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
             {
-                WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
+                WeakEvents.ThreadSafePropertyChanged.Unsubscribe(inpc, this);
             }
         }
 
@@ -138,7 +138,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         private void SubscribeToChanges()
         {
             if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
-                WeakEvents.PropertyChanged.Subscribe(inpc, this);
+                WeakEvents.ThreadSafePropertyChanged.Subscribe(inpc, this);
         }
     }