Merge branch 'master' into opengl-warning-fixes

samples/IntegrationTestApp/MainWindow.axaml

@@ -153,6 +153,9 @@
           </StackPanel>
         </Grid>
       </TabItem>
+      <TabItem Header="SliderTab">
+          <Slider VerticalAlignment="Top" Name="Slider" Value="30"/>
+      </TabItem>
     </TabControl>
   </DockPanel>
 </Window>

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/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/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/Automation/Peers/SliderAutomationPeer.cs

@@ -0,0 +1,22 @@
+using Avalonia.Automation.Peers;
+
+namespace Avalonia.Controls.Automation.Peers
+{
+    public class SliderAutomationPeer : RangeBaseAutomationPeer
+    {
+        public SliderAutomationPeer(Slider owner) : base(owner)
+        {
+        }
+
+        override protected string GetClassNameCore()
+        {
+            return "Slider";
+        }
+
+        override protected AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Slider;
+        }
+
+    }
+}

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/Slider.cs

@@ -10,6 +10,7 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Utilities;
 using Avalonia.Automation;
+using Avalonia.Controls.Automation.Peers;
 
 namespace Avalonia.Controls
 {
@@ -380,6 +381,11 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new SliderAutomationPeer(this);
+        }
+
         /// <inheritdoc />
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {

src/Windows/Avalonia.Win32/Automation/AutomationNode.cs

@@ -20,7 +20,6 @@ namespace Avalonia.Win32.Automation
         IRawElementProviderSimple,
         IRawElementProviderSimple2,
         IRawElementProviderFragment,
-        IRawElementProviderAdviseEvents,
         IInvokeProvider
     {
         private static Dictionary<AutomationProperty, UiaPropertyId> s_propertyMap = new()
@@ -47,14 +46,31 @@ namespace Avalonia.Win32.Automation
         private static ConditionalWeakTable<AutomationPeer, AutomationNode> s_nodes = new();
 
         private readonly int[] _runtimeId;
-        private int _raiseFocusChanged;
-        private int _raisePropertyChanged;
 
         public AutomationNode(AutomationPeer peer)
         {
             _runtimeId = new int[] { 3, GetHashCode() };
             Peer = peer;
             s_nodes.Add(peer, this);
+            peer.ChildrenChanged += Peer_ChildrenChanged;
+            peer.PropertyChanged += Peer_PropertyChanged;
+        }
+
+        private void Peer_ChildrenChanged(object? sender, EventArgs e)
+        {
+            ChildrenChanged();
+        }
+
+        private void Peer_PropertyChanged(object? sender, AutomationPropertyChangedEventArgs e)
+        {
+            if (s_propertyMap.TryGetValue(e.Property, out var id))
+            {
+                UiaCoreProviderApi.UiaRaiseAutomationPropertyChangedEvent(
+                    this,
+                    (int)id,
+                    e.OldValue as IConvertible,
+                    e.NewValue as IConvertible);
+            }
         }
 
         public AutomationPeer Peer { get; protected set; }
@@ -86,14 +102,6 @@ namespace Avalonia.Win32.Automation
                 0);
         }
 
-        public void PropertyChanged(AutomationProperty property, object? oldValue, object? newValue) 
-        {
-            if (_raisePropertyChanged > 0 && s_propertyMap.TryGetValue(property, out var id))
-            {
-                UiaCoreProviderApi.UiaRaiseAutomationPropertyChangedEvent(this, (int)id, oldValue, newValue);
-            }
-        }
-
         [return: MarshalAs(UnmanagedType.IUnknown)]
         public virtual object? GetPatternProvider(int patternId)
         {
@@ -188,32 +196,6 @@ namespace Avalonia.Win32.Automation
         void IRawElementProviderSimple2.ShowContextMenu() => InvokeSync(() => Peer.ShowContextMenu());
         void IInvokeProvider.Invoke() => InvokeSync((AAP.IInvokeProvider x) => x.Invoke());
 
-        void IRawElementProviderAdviseEvents.AdviseEventAdded(int eventId, int[] properties)
-        {
-            switch ((UiaEventId)eventId)
-            {
-                case UiaEventId.AutomationPropertyChanged:
-                    ++_raisePropertyChanged;
-                    break;
-                case UiaEventId.AutomationFocusChanged:
-                    ++_raiseFocusChanged;
-                    break;
-            }
-        }
-
-        void IRawElementProviderAdviseEvents.AdviseEventRemoved(int eventId, int[] properties)
-        {
-            switch ((UiaEventId)eventId)
-            {
-                case UiaEventId.AutomationPropertyChanged:
-                    --_raisePropertyChanged;
-                    break;
-                case UiaEventId.AutomationFocusChanged:
-                    --_raiseFocusChanged;
-                    break;
-            }
-        }
-
         protected void InvokeSync(Action action)
         {
             if (Dispatcher.UIThread.CheckAccess())
@@ -266,15 +248,6 @@ namespace Avalonia.Win32.Automation
             throw new NotSupportedException();
         }
 
-        protected void RaiseFocusChanged(AutomationNode? focused)
-        {
-            if (_raiseFocusChanged > 0)
-            {
-                UiaCoreProviderApi.UiaRaiseAutomationEvent(
-                    focused,
-                    (int)UiaEventId.AutomationFocusChanged);
-            }
-        }
 
         private AutomationNode? GetRoot()
         {

src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs

@@ -10,8 +10,11 @@ namespace Avalonia.Win32.Automation
 {
     [RequiresUnreferencedCode("Requires .NET COM interop")]
     internal class RootAutomationNode : AutomationNode,
-        IRawElementProviderFragmentRoot
+        IRawElementProviderFragmentRoot,
+        IRawElementProviderAdviseEvents
     {
+        private int _raiseFocusChanged;
+
         public RootAutomationNode(AutomationPeer peer)
             : base(peer)
         {
@@ -42,6 +45,36 @@ namespace Avalonia.Win32.Automation
             return GetOrCreate(focus);
         }
 
+        void IRawElementProviderAdviseEvents.AdviseEventAdded(int eventId, int[] properties)
+        {
+            switch ((UiaEventId)eventId)
+            {
+                case UiaEventId.AutomationFocusChanged:
+                    ++_raiseFocusChanged;
+                    break;
+            }
+        }
+
+        void IRawElementProviderAdviseEvents.AdviseEventRemoved(int eventId, int[] properties)
+        {
+            switch ((UiaEventId)eventId)
+            {
+                case UiaEventId.AutomationFocusChanged:
+                    --_raiseFocusChanged;
+                    break;
+            }
+        }
+
+        protected void RaiseFocusChanged(AutomationNode? focused)
+        {
+            if (_raiseFocusChanged > 0)
+            {
+                UiaCoreProviderApi.UiaRaiseAutomationEvent(
+                    focused,
+                    (int)UiaEventId.AutomationFocusChanged);
+            }
+        }
+
         public void FocusChanged(object? sender, EventArgs e)
         {
             RaiseFocusChanged(GetOrCreate(Peer.GetFocus()));

tests/Avalonia.IntegrationTests.Appium/SliderTests.cs

@@ -0,0 +1,35 @@
+using System;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    [Collection("Default")]
+    public class SliderTests
+    {
+        private readonly AppiumDriver<AppiumWebElement> _session;
+
+        public SliderTests(TestAppFixture fixture)
+        {
+            _session = fixture.Session;
+
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("SliderTab");
+            tab.Click();
+        }
+
+        [Fact]
+        public void Changes_Value_When_Clicking_Increase_Button()
+        {
+            var slider = _session.FindElementByAccessibilityId("Slider");
+
+            // slider.Text gets the Slider value
+            Assert.True(double.Parse(slider.Text) == 30);
+
+            new Actions(_session).Click(slider).Perform();
+
+            Assert.Equal(50, Math.Round(double.Parse(slider.Text)));
+        }
+    }
+}