From add676efab0f904b6200824c567ac6d238462419 Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 13 Jul 2023 13:08:47 +0300
Subject: [PATCH 01/80] Add failing tests

---
 .../TransitioningContentControlTests.cs       | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
index 02dd4e6c03..0e817b1887 100644
--- a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
@@ -183,6 +183,31 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal("bar", presenter2.Content);
         }
 
+        [Fact]
+        public void Logical_Children_Dont_Duplicated()
+        {
+            using var app = Start();
+            var (target, transition) = CreateTarget("");
+
+            var childControl = new Control();
+            target.Content = childControl;
+
+            // There should be two, One the initial content and one the new content.
+            Assert.Equal(2, target.LogicalChildren.Count);
+        }
+
+        [Fact]
+        public void First_Presenter_Register_TCC_As_Host()
+        {
+            using var app = Start();
+            var (target, transition) = CreateTarget("");
+
+            var childControl = new Control();
+            target.Presenter!.Content = childControl;
+
+            Assert.Contains(childControl, target.LogicalChildren);
+        }
+
         private static IDisposable Start()
         {
             return UnitTestApplication.Start(

From f7a584e86e0db552cd5509bd827361360ff8211c Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 13 Jul 2023 13:14:11 +0300
Subject: [PATCH 02/80] Return true when first presenter register and fix
 logical children duplicated

---
 src/Avalonia.Controls/ContentControl.cs          | 16 ++++++++++++++++
 .../TransitioningContentControl.cs               | 11 +++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index 867dca2be1..176157001e 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -95,6 +95,17 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         IAvaloniaList<ILogical> IContentPresenterHost.LogicalChildren => LogicalChildren;
 
+        /// <summary>
+        /// Determine whether <see cref="ContentControl"/> manage his LogicalChildren 
+        ///(default behavior) himself, or leaves the management to the inherited control.
+        /// </summary>
+        /// <remarks>
+		/// The default value is false, So the <see cref="ContentControl"/> manages itself, 
+        /// if you want to bypass this behavior and manage LogicalChildren yourself, set 
+        /// the <see cref="BypassLogicalChildrenManangment"/> to true.
+		/// </remarks>
+        protected virtual bool BypassLogicalChildrenManangment => false;
+
         /// <inheritdoc/>
         bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
@@ -118,6 +129,11 @@ namespace Avalonia.Controls
 
         private void ContentChanged(AvaloniaPropertyChangedEventArgs e)
         {
+            if (BypassLogicalChildrenManangment)
+            {
+                return;
+            }
+            
             if (e.OldValue is ILogical oldChild)
             {
                 LogicalChildren.Remove(oldChild);
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index bf540698f1..75f95d1d68 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -36,6 +36,9 @@ public class TransitioningContentControl : ContentControl
         set => SetValue(PageTransitionProperty, value);
     }
 
+    /// <inheritdoc/>
+    protected override bool BypassLogicalChildrenManangment => true;
+
     protected override Size ArrangeOverride(Size finalSize)
     {
         var result = base.ArrangeOverride(finalSize);
@@ -79,8 +82,12 @@ public class TransitioningContentControl : ContentControl
 
     protected override bool RegisterContentPresenter(ContentPresenter presenter)
     {
-        if (!base.RegisterContentPresenter(presenter) &&
-            presenter is ContentPresenter p &&
+        if (base.RegisterContentPresenter(presenter))
+        {
+            return true;
+        }
+
+        if (presenter is ContentPresenter p &&
             p.Name == "PART_ContentPresenter2")
         {
             _presenter2 = p;

From abc7eea3369642162617c9a20a91b27e0d7b87dc Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 13 Jul 2023 15:33:42 +0300
Subject: [PATCH 03/80] simplifies the first test

---
 .../TransitioningContentControlTests.cs                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
index 0e817b1887..210b24b3ad 100644
--- a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
@@ -188,12 +188,12 @@ namespace Avalonia.Controls.UnitTests
         {
             using var app = Start();
             var (target, transition) = CreateTarget("");
+            target.PageTransition = null;
 
             var childControl = new Control();
             target.Content = childControl;
 
-            // There should be two, One the initial content and one the new content.
-            Assert.Equal(2, target.LogicalChildren.Count);
+            Assert.Equal(1, target.LogicalChildren.Count);
         }
 
         [Fact]

From 35be25ee2e99f03ca0dfa6f96f0c6dd47edf8d05 Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 13 Jul 2023 16:38:11 +0300
Subject: [PATCH 04/80] typo

---
 src/Avalonia.Controls/ContentControl.cs              | 4 ++--
 src/Avalonia.Controls/TransitioningContentControl.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index 176157001e..362931eafa 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -102,9 +102,9 @@ namespace Avalonia.Controls
         /// <remarks>
 		/// The default value is false, So the <see cref="ContentControl"/> manages itself, 
         /// if you want to bypass this behavior and manage LogicalChildren yourself, set 
-        /// the <see cref="BypassLogicalChildrenManangment"/> to true.
+        /// the <see cref="BypassLogicalChildrenManagement"/> to true.
 		/// </remarks>
-        protected virtual bool BypassLogicalChildrenManangment => false;
+        protected virtual bool BypassLogicalChildrenManagement => false;
 
         /// <inheritdoc/>
         bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index 75f95d1d68..c113afde17 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -37,7 +37,7 @@ public class TransitioningContentControl : ContentControl
     }
 
     /// <inheritdoc/>
-    protected override bool BypassLogicalChildrenManangment => true;
+    protected override bool BypassLogicalChildrenManagement => true;
 
     protected override Size ArrangeOverride(Size finalSize)
     {

From 007800357865a37db308512ff4731b42ee9bcf15 Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 13 Jul 2023 21:02:45 +0300
Subject: [PATCH 05/80] typo

---
 src/Avalonia.Controls/ContentControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index 362931eafa..47f7598900 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -129,7 +129,7 @@ namespace Avalonia.Controls
 
         private void ContentChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (BypassLogicalChildrenManangment)
+            if (BypassLogicalChildrenManagement)
             {
                 return;
             }

From 45b592c8b102f3a2ac23fb83559a0470dac36eef Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 15:27:05 +0300
Subject: [PATCH 06/80] fix CF_DIB value
 (https://learn.microsoft.com/en-us/windows/win32/dataxchg/standard-clipboard-formats
 says that CF_DIB is equal to 8)

---
 src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 68f3e3c670..9c1e68453c 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -2137,7 +2137,7 @@ namespace Avalonia.Win32.Interop
             /// <summary>
             /// A memory object containing a BITMAPINFO structure followed by the bitmap bits.
             /// </summary>
-            CF_DIB = 3,
+            CF_DIB = 8,
             /// <summary>
             /// Unicode text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data.
             /// </summary>

From e02476f88c7cc19dd754e207e5e4cbef84e85484 Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 15:36:48 +0300
Subject: [PATCH 07/80] add predefined image clipboard formats because
 GetClipboardFormatName cannot get a name for predefined. The Unknown_Format_
 template is poor for system formats

---
 src/Windows/Avalonia.Win32/ClipboardFormats.cs   |  7 +++++++
 .../Avalonia.Win32/Interop/UnmanagedMethods.cs   | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index 00fdeb2a1d..b1b1a67ba0 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -33,6 +33,13 @@ namespace Avalonia.Win32
 #pragma warning disable CS0618 // Type or member is obsolete
             new ClipboardFormat(DataFormats.FileNames, (ushort)UnmanagedMethods.ClipboardFormat.CF_HDROP),
 #pragma warning restore CS0618 // Type or member is obsolete
+
+            new ClipboardFormat("Bitmap", (ushort)UnmanagedMethods.ClipboardFormat.CF_BITMAP),
+            new ClipboardFormat("MetafilePict", (ushort)UnmanagedMethods.ClipboardFormat.CF_METAFILEPICT),
+            new ClipboardFormat("Dib", (ushort)UnmanagedMethods.ClipboardFormat.CF_DIB),
+            new ClipboardFormat("EnhancedMetafile", (ushort)UnmanagedMethods.ClipboardFormat.CF_ENHMETAFILE),
+            new ClipboardFormat("Palette", (ushort)UnmanagedMethods.ClipboardFormat.CF_PALETTE),
+            new ClipboardFormat("PenData", (ushort)UnmanagedMethods.ClipboardFormat.CF_PENDATA),
         };
 
 
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 9c1e68453c..f2987f50d5 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -2135,14 +2135,30 @@ namespace Avalonia.Win32.Interop
             /// </summary>
             CF_BITMAP = 2,
             /// <summary>
+            /// Handle to a metafile picture format as defined by the METAFILEPICT structure. When passing a CF_METAFILEPICT handle by means of DDE, the application responsible for deleting hMem should also free the metafile referred to by the CF_METAFILEPICT handle.
+            /// </summary>
+            CF_METAFILEPICT = 3,
+            /// <summary>
             /// A memory object containing a BITMAPINFO structure followed by the bitmap bits.
             /// </summary>
             CF_DIB = 8,
             /// <summary>
+            /// Handle to a color palette.
+            /// </summary>
+            CF_PALETTE = 9,
+            /// <summary>
+            /// Data for the pen extensions to the Microsoft Windows for Pen Computing.
+            /// </summary>
+            CF_PENDATA = 10,
+            /// <summary>
             /// Unicode text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data.
             /// </summary>
             CF_UNICODETEXT = 13,
             /// <summary>
+            /// A handle to an enhanced metafile (HENHMETAFILE).
+            /// </summary>
+            CF_ENHMETAFILE = 14,
+            /// <summary>
             /// A handle to type HDROP that identifies a list of files. 
             /// </summary>
             CF_HDROP = 15,

From 2b7dbdb9707dc3521411bfb94683bfc5c6940525 Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 19:52:36 +0300
Subject: [PATCH 08/80] add predefined image clipboard formats because
 GetClipboardFormatName cannot get a name for predefined. The Unknown_Format_
 template is poor for system formats

---
 src/Windows/Avalonia.Win32/ClipboardFormats.cs         | 2 +-
 src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index b1b1a67ba0..5d5bad5ffd 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Win32
 
             new ClipboardFormat("Bitmap", (ushort)UnmanagedMethods.ClipboardFormat.CF_BITMAP),
             new ClipboardFormat("MetafilePict", (ushort)UnmanagedMethods.ClipboardFormat.CF_METAFILEPICT),
-            new ClipboardFormat("Dib", (ushort)UnmanagedMethods.ClipboardFormat.CF_DIB),
+            new ClipboardFormat("Dib", (ushort)UnmanagedMethods.ClipboardFormat.CF_DIB, (ushort)UnmanagedMethods.ClipboardFormat.CF_DIBV5),
             new ClipboardFormat("EnhancedMetafile", (ushort)UnmanagedMethods.ClipboardFormat.CF_ENHMETAFILE),
             new ClipboardFormat("Palette", (ushort)UnmanagedMethods.ClipboardFormat.CF_PALETTE),
             new ClipboardFormat("PenData", (ushort)UnmanagedMethods.ClipboardFormat.CF_PENDATA),
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f2987f50d5..a1e9165117 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -2162,6 +2162,10 @@ namespace Avalonia.Win32.Interop
             /// A handle to type HDROP that identifies a list of files. 
             /// </summary>
             CF_HDROP = 15,
+            /// <summary>
+            /// A memory object containing a BITMAPV5HEADER structure followed by the bitmap color space information and the bitmap bits.
+            /// </summary>
+            CF_DIBV5 = 17,
         }
 
         public struct MSG

From 2f51fec236b41a0643023379426cbce749ec2f9e Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 19:54:08 +0300
Subject: [PATCH 09/80] wip. ControlCatalog. handling of bitmap formats in
 clipboard

---
 .../ControlCatalog/Pages/ClipboardPage.xaml   |  8 +++--
 .../Pages/ClipboardPage.xaml.cs               | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 4199a9780f..664e0036e5 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -12,12 +12,16 @@
     <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
     <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
 
+    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" />
+    <Button Click="PasteBitmapDataObject" Content="Paste bitmap (CF_DIB, image/bmp) from clipboard (data object)" />
+
     <Button Click="GetFormats" Content="Get clipboard formats" />
     <Button Click="Clear" Content="Clear clipboard" />
 
     <TextBox x:Name="ClipboardContent"
-             MinHeight="100"
+             MinHeight="400"
              AcceptsReturn="True"
-             Watermark="Text to copy of file names per line" />
+             Watermark="Text to copy of file names per line"
+             TextWrapping="Wrap"/>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index 089d1af197..5fc6d175ea 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -118,6 +119,36 @@ namespace ControlCatalog.Pages
             }
         }
 
+        private void CopyBitmapDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
+            {
+
+            }
+        }
+
+        private async void PasteBitmapDataObject(object? sender, RoutedEventArgs args)
+        {
+            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
+            {
+                var bytes = await clipboard.GetDataAsync("Bitmap") as IEnumerable<byte> 
+                    ?? await clipboard.GetDataAsync("Dib") as IEnumerable<byte>;
+
+                if (bytes != null)
+                {
+                    var printable = bytes.Take(1000);
+                    var sb = new StringBuilder(256 + printable.Count() * 3);
+                    sb.AppendLine($"{bytes.Count()} bytes, list of first {printable.Count()}");
+                    sb.AppendJoin(" ", printable.Select(x => x.ToString("X2")));
+                    ClipboardContent.Text = sb.ToString();
+                }
+                else
+                {
+                    ClipboardContent.Text = string.Empty;
+                }
+            }
+        }
+
         private async void GetFormats(object sender, RoutedEventArgs args)
         {
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)

From 3098b22ba5dfada448f44ee8106e16598247feda Mon Sep 17 00:00:00 2001
From: Vitalii Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 22:08:29 +0300
Subject: [PATCH 10/80] x11. fix nullref

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index 5fc6d175ea..c96318507b 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -154,7 +154,7 @@ namespace ControlCatalog.Pages
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
             {
                 var formats = await clipboard.GetFormatsAsync();
-                ClipboardContent.Text = string.Join(Environment.NewLine, formats);
+                ClipboardContent.Text = formats != null ? string.Join(Environment.NewLine, formats) : string.Empty;
             }
         }
 

From 1484a7d1889b59cc692fd0a84659cb81ef8826ef Mon Sep 17 00:00:00 2001
From: Vitalii Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 22:54:29 +0300
Subject: [PATCH 11/80] wip. ControlCatalog. handling of basic bitmap formats
 on the clipboard

---
 .../Pages/ClipboardPage.xaml.cs               | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index c96318507b..af413e383d 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -131,14 +131,40 @@ namespace ControlCatalog.Pages
         {
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
             {
-                var bytes = await clipboard.GetDataAsync("Bitmap") as IEnumerable<byte> 
-                    ?? await clipboard.GetDataAsync("Dib") as IEnumerable<byte>;
+                var format = "Bitmap";
+
+                var obj = await clipboard.GetDataAsync(format);
+                var bytes = obj as IEnumerable<byte>;
+                if (bytes == null)
+                {
+                    format = "Dib";
+                    obj = await clipboard.GetDataAsync(format);
+                    bytes = obj as IEnumerable<byte>;
+                }
+                if (bytes == null)
+                {
+                    format = "image/bmp";
+                    obj = await clipboard.GetDataAsync(format);
+                    bytes = obj as IEnumerable<byte>;
+                }
+                if (bytes == null)
+                {
+                    format = "image/png";
+                    obj = await clipboard.GetDataAsync(format);
+                    bytes = obj as IEnumerable<byte>;
+                }
+                if (bytes == null)
+                {
+                    format = "image/jpeg";
+                    obj = await clipboard.GetDataAsync(format);
+                    bytes = obj as IEnumerable<byte>;
+                }
 
                 if (bytes != null)
                 {
                     var printable = bytes.Take(1000);
                     var sb = new StringBuilder(256 + printable.Count() * 3);
-                    sb.AppendLine($"{bytes.Count()} bytes, list of first {printable.Count()}");
+                    sb.AppendLine($"format: {format}, {bytes.Count()} bytes, list of first {printable.Count()}");
                     sb.AppendJoin(" ", printable.Select(x => x.ToString("X2")));
                     ClipboardContent.Text = sb.ToString();
                 }

From 6df0f1caa1c60d66dc5c111fb6bb2bbfc0eedf87 Mon Sep 17 00:00:00 2001
From: Vitalii Orazov <viordash@mail.ru>
Date: Mon, 17 Jul 2023 22:59:52 +0300
Subject: [PATCH 12/80] disable CopyBitmapDataObject

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml    | 2 +-
 samples/ControlCatalog/Pages/ClipboardPage.xaml.cs | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 664e0036e5..10fb8f8590 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -12,7 +12,7 @@
     <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
     <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
 
-    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" />
+    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" IsEnabled="False" />
     <Button Click="PasteBitmapDataObject" Content="Paste bitmap (CF_DIB, image/bmp) from clipboard (data object)" />
 
     <Button Click="GetFormats" Content="Get clipboard formats" />
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index af413e383d..de39036ba5 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -121,10 +121,7 @@ namespace ControlCatalog.Pages
 
         private void CopyBitmapDataObject(object? sender, RoutedEventArgs args)
         {
-            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
-            {
-
-            }
+            throw new NotSupportedException();
         }
 
         private async void PasteBitmapDataObject(object? sender, RoutedEventArgs args)

From 0ec1c44d072364da54015ec56d8f2c958e561716 Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Tue, 18 Jul 2023 00:25:43 +0300
Subject: [PATCH 13/80] implement CopyBitmapDataObject

---
 .../ControlCatalog/Pages/ClipboardPage.xaml   |  5 ++-
 .../Pages/ClipboardPage.xaml.cs               | 34 ++++++++++++++++---
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 10fb8f8590..1d0bcb8e4b 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -12,7 +12,7 @@
     <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
     <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
 
-    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" IsEnabled="False" />
+    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" />
     <Button Click="PasteBitmapDataObject" Content="Paste bitmap (CF_DIB, image/bmp) from clipboard (data object)" />
 
     <Button Click="GetFormats" Content="Get clipboard formats" />
@@ -21,7 +21,6 @@
     <TextBox x:Name="ClipboardContent"
              MinHeight="400"
              AcceptsReturn="True"
-             Watermark="Text to copy of file names per line"
-             TextWrapping="Wrap"/>
+             Watermark="Text to copy of file names per line" />
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index de39036ba5..2c8fada368 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -119,9 +119,24 @@ namespace ControlCatalog.Pages
             }
         }
 
-        private void CopyBitmapDataObject(object? sender, RoutedEventArgs args)
+        private async void CopyBitmapDataObject(object? sender, RoutedEventArgs args)
         {
-            throw new NotSupportedException();
+            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
+            {
+                var lines = (ClipboardContent.Text ?? string.Empty)
+                    .Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                if (lines.Length < 3)
+                {
+                    return;
+                }
+                var format = lines[0];
+                var hexLine = string.Join(" ", lines.Skip(2));
+                var hexBytes = hexLine.Split(new[] { ' ', '-' }, StringSplitOptions.RemoveEmptyEntries);
+                var bytes = hexBytes.Select(x => Convert.ToByte(x, 16));
+                var dataObject = new DataObject();
+                dataObject.Set(format, bytes);
+                await clipboard.SetDataObjectAsync(dataObject);
+            }
         }
 
         private async void PasteBitmapDataObject(object? sender, RoutedEventArgs args)
@@ -133,6 +148,12 @@ namespace ControlCatalog.Pages
                 var obj = await clipboard.GetDataAsync(format);
                 var bytes = obj as IEnumerable<byte>;
                 if (bytes == null)
+                {
+                    format = "Unknown_Format_8";
+                    obj = await clipboard.GetDataAsync(format);
+                    bytes = obj as IEnumerable<byte>;
+                }
+                if (bytes == null)
                 {
                     format = "Dib";
                     obj = await clipboard.GetDataAsync(format);
@@ -159,11 +180,14 @@ namespace ControlCatalog.Pages
 
                 if (bytes != null)
                 {
-                    var printable = bytes.Take(1000);
+                    var printable = bytes.ToArray();
                     var sb = new StringBuilder(256 + printable.Count() * 3);
-                    sb.AppendLine($"format: {format}, {bytes.Count()} bytes, list of first {printable.Count()}");
-                    sb.AppendJoin(" ", printable.Select(x => x.ToString("X2")));
+                    sb.AppendLine($"{format}");
+                    sb.AppendLine($"{bytes.Count()} bytes (list of first {printable.Count()} bytes)");
+                    sb.Append(BitConverter.ToString(printable).Replace('-', ' '));
+                    ClipboardContent.TextWrapping = Avalonia.Media.TextWrapping.NoWrap;
                     ClipboardContent.Text = sb.ToString();
+                    ClipboardContent.TextWrapping = Avalonia.Media.TextWrapping.Wrap;
                 }
                 else
                 {

From eee28d05530625fb4398f89fcbfdf025d9b0e3f0 Mon Sep 17 00:00:00 2001
From: Vitalii Orazov <viordash@mail.ru>
Date: Tue, 18 Jul 2023 00:50:53 +0300
Subject: [PATCH 14/80] remove extra

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml    | 2 +-
 samples/ControlCatalog/Pages/ClipboardPage.xaml.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 1d0bcb8e4b..68f8babdc3 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -19,7 +19,7 @@
     <Button Click="Clear" Content="Clear clipboard" />
 
     <TextBox x:Name="ClipboardContent"
-             MinHeight="400"
+             MinHeight="100"
              AcceptsReturn="True"
              Watermark="Text to copy of file names per line" />
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index 2c8fada368..c2c2cd551c 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -181,9 +181,9 @@ namespace ControlCatalog.Pages
                 if (bytes != null)
                 {
                     var printable = bytes.ToArray();
-                    var sb = new StringBuilder(256 + printable.Count() * 3);
+                    var sb = new StringBuilder(256 + printable.Length * 3);
                     sb.AppendLine($"{format}");
-                    sb.AppendLine($"{bytes.Count()} bytes (list of first {printable.Count()} bytes)");
+                    sb.AppendLine($"{printable.Length} bytes");
                     sb.Append(BitConverter.ToString(printable).Replace('-', ' '));
                     ClipboardContent.TextWrapping = Avalonia.Media.TextWrapping.NoWrap;
                     ClipboardContent.Text = sb.ToString();

From 4b0c68932dbfdc791bfa9b9aad03f99f6f8be030 Mon Sep 17 00:00:00 2001
From: Vitalii Orazov <viordash@mail.ru>
Date: Tue, 18 Jul 2023 14:36:19 +0300
Subject: [PATCH 15/80] fix CopyBitmapDataObject

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index c2c2cd551c..8fff99e8a9 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -132,7 +132,7 @@ namespace ControlCatalog.Pages
                 var format = lines[0];
                 var hexLine = string.Join(" ", lines.Skip(2));
                 var hexBytes = hexLine.Split(new[] { ' ', '-' }, StringSplitOptions.RemoveEmptyEntries);
-                var bytes = hexBytes.Select(x => Convert.ToByte(x, 16));
+                var bytes = hexBytes.Select(x => Convert.ToByte(x, 16)).ToArray();
                 var dataObject = new DataObject();
                 dataObject.Set(format, bytes);
                 await clipboard.SetDataObjectAsync(dataObject);

From 1f9e0a880d05214433de084f50cdb50b44346f3f Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Tue, 18 Jul 2023 15:19:02 +0300
Subject: [PATCH 16/80] remove extra

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index 8fff99e8a9..b4c8544a72 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -144,16 +144,9 @@ namespace ControlCatalog.Pages
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
             {
                 var format = "Bitmap";
-
                 var obj = await clipboard.GetDataAsync(format);
                 var bytes = obj as IEnumerable<byte>;
                 if (bytes == null)
-                {
-                    format = "Unknown_Format_8";
-                    obj = await clipboard.GetDataAsync(format);
-                    bytes = obj as IEnumerable<byte>;
-                }
-                if (bytes == null)
                 {
                     format = "Dib";
                     obj = await clipboard.GetDataAsync(format);

From 92250390a971cc7ec22db61b01b26e97239a68e7 Mon Sep 17 00:00:00 2001
From: Vitaliy Orazov <viordash@mail.ru>
Date: Tue, 18 Jul 2023 16:34:33 +0300
Subject: [PATCH 17/80] change button's text

---
 samples/ControlCatalog/Pages/ClipboardPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 68f8babdc3..57b3111ab3 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -12,8 +12,8 @@
     <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
     <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
 
-    <Button Click="CopyBitmapDataObject" Content="Copy bitmap (CF_DIB, image/bmp) to clipboard (data object)" />
-    <Button Click="PasteBitmapDataObject" Content="Paste bitmap (CF_DIB, image/bmp) from clipboard (data object)" />
+    <Button Click="CopyBitmapDataObject" Content="Copy image to clipboard (data object)" ToolTip.Tip="CF_BITMAP, CF_DIB, image/bmp, image/png, image/jpeg" />
+    <Button Click="PasteBitmapDataObject" Content="Paste image from clipboard (data object)" ToolTip.Tip="CF_BITMAP, CF_DIB, image/bmp, image/png, image/jpeg" />
 
     <Button Click="GetFormats" Content="Get clipboard formats" />
     <Button Click="Clear" Content="Clear clipboard" />

From 0e7b8f6f4589195ae35e933c64f89f9478832fb1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:17:48 +0200
Subject: [PATCH 18/80] Allow embedded root automation peers.

---
 .../Avalonia.Win32/Automation/RootAutomationNode.cs  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
index 739f0ac251..0a73c8bc7b 100644
--- a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Win32.Automation
                 return null;
 
             var p = WindowImpl.PointToClient(new PixelPoint((int)x, (int)y));
-            var found = InvokeSync(() => Peer.GetPeerFromPoint(p));
+            var found = InvokeSync(() => GetPeerFromPoint(p));
             var result = GetOrCreate(found) as IRawElementProviderFragment;
             return result;
         }
@@ -101,5 +101,15 @@ namespace Avalonia.Win32.Automation
                 return result;
             }
         }
+
+        private AutomationPeer? GetPeerFromPoint(Point p)
+        {
+            var hit = Peer.GetPeerFromPoint(p);
+
+            while (hit != Peer && hit?.GetProvider<IRootProvider>() is { } embeddedRoot)
+                hit = embeddedRoot.GetPeerFromPoint(p);
+                
+            return hit;
+        }
     }
 }

From 2c91d7f89323c736dd4afeaf6e13ad5efc247b06 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 26 Jul 2023 12:45:58 +0200
Subject: [PATCH 19/80] Handle null from RootProvider_GetWindow.

---
 native/Avalonia.Native/src/OSX/automation.mm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index d0c8d7a9db..4b325a092d 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -73,6 +73,13 @@ private:
     if (peer->IsRootProvider())
     {
         auto window = peer->RootProvider_GetWindow();
+        
+        if (window == nullptr)
+        {
+            NSLog(@"IRootProvider.PlatformImpl returned null or a non-WindowBaseImpl.");
+            return nil;
+        }
+        
         auto holder = dynamic_cast<INSWindowHolder*>(window);
         auto view = holder->GetNSView();
         return [[AvnRootAccessibilityElement alloc] initWithPeer:peer owner:view];

From 8d5ef676f5098257889925419501799596aa1bf7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 26 Jul 2023 12:46:25 +0200
Subject: [PATCH 20/80] Allow non-ControlAutomationPeer IRootProviders.

---
 src/Avalonia.Native/AvnAutomationPeer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 6c4e96b31b..038b62a7f6 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -74,10 +74,11 @@ namespace Avalonia.Native
         
         public int IsRootProvider() => (_inner is IRootProvider).AsComBool();
 
-        public IAvnWindowBase RootProvider_GetWindow()
+        public IAvnWindowBase? RootProvider_GetWindow()
         {
-            var window = (WindowBase)((ControlAutomationPeer)_inner).Owner;
-            return ((WindowBaseImpl)window.PlatformImpl!).Native;
+            if (((IRootProvider)_inner).PlatformImpl is WindowBaseImpl impl)
+                return impl.Native;
+            return null;
         }
         
         public IAvnAutomationPeer? RootProvider_GetFocus() => Wrap(((IRootProvider)_inner).GetFocus());

From da993425e7a18c545d591259eb1a19a8bc27f5a9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 26 Jul 2023 13:46:35 +0200
Subject: [PATCH 21/80] Fix determining if a peer supports a provider.

We should use `GetProvider<T>` instead of a plain cast as a peer may decide to dynamically support a provider, or delegate its implementation.
---
 src/Avalonia.Native/AvnAutomationPeer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 038b62a7f6..6b1b4a7a03 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Native
             Node = node;
         }
         
-        public int IsRootProvider() => (_inner is IRootProvider).AsComBool();
+        public int IsRootProvider() => (_inner.GetProvider<IRootProvider>() is not null).AsComBool();
 
         public IAvnWindowBase? RootProvider_GetWindow()
         {
@@ -104,7 +104,7 @@ namespace Avalonia.Native
             return Wrap(result);
         }
 
-        public int IsExpandCollapseProvider() => (_inner is IExpandCollapseProvider).AsComBool();
+        public int IsExpandCollapseProvider() => (_inner.GetProvider<IExpandCollapseProvider>() is not null).AsComBool();
 
         public int ExpandCollapseProvider_GetIsExpanded() => ((IExpandCollapseProvider)_inner).ExpandCollapseState switch
         {
@@ -128,14 +128,14 @@ namespace Avalonia.Native
         public double RangeValueProvider_GetLargeChange() => ((IRangeValueProvider)_inner).LargeChange;
         public void RangeValueProvider_SetValue(double value) => ((IRangeValueProvider)_inner).SetValue(value);
 
-        public int IsSelectionItemProvider() => (_inner is ISelectionItemProvider).AsComBool();
+        public int IsSelectionItemProvider() => (_inner.GetProvider<ISelectionItemProvider>() is not null).AsComBool();
         public int SelectionItemProvider_IsSelected() => ((ISelectionItemProvider)_inner).IsSelected.AsComBool();
         
-        public int IsToggleProvider() => (_inner is IToggleProvider).AsComBool();
+        public int IsToggleProvider() => (_inner.GetProvider<IToggleProvider>() is not null).AsComBool();
         public int ToggleProvider_GetToggleState() => (int)((IToggleProvider)_inner).ToggleState;
         public void ToggleProvider_Toggle() => ((IToggleProvider)_inner).Toggle();
 
-        public int IsValueProvider() => (_inner is IValueProvider).AsComBool();
+        public int IsValueProvider() => (_inner.GetProvider<IValueProvider>() is not null).AsComBool();
         public IAvnString ValueProvider_GetValue() => ((IValueProvider)_inner).Value.ToAvnString();
         public void ValueProvider_SetValue(string value) => ((IValueProvider)_inner).SetValue(value);
 

From c9dfda42ebd524e19205d756ba6c625496e9361d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 26 Jul 2023 17:31:43 +0200
Subject: [PATCH 22/80] More fixing of provider resolution.

The previous commit missed some providers, and we also need to call `GetProvider<T>` when calling members on the provider.
---
 src/Avalonia.Native/AvnAutomationPeer.cs | 88 +++++++++++++-----------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 6b1b4a7a03..8069ac76bf 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -48,6 +48,13 @@ namespace Avalonia.Native
         public void SetFocus() => _inner.SetFocus();
         public int ShowContextMenu() => _inner.ShowContextMenu().AsComBool();
 
+        public void SetNode(IAvnAutomationNode node)
+        {
+            if (Node is not null)
+                throw new InvalidOperationException("The AvnAutomationPeer already has a node.");
+            Node = node;
+        }
+
         public IAvnAutomationPeer? RootPeer
         {
             get
@@ -65,27 +72,22 @@ namespace Avalonia.Native
             }
         }
 
-        public void SetNode(IAvnAutomationNode node)
-        {
-            if (Node is not null)
-                throw new InvalidOperationException("The AvnAutomationPeer already has a node.");
-            Node = node;
-        }
-        
-        public int IsRootProvider() => (_inner.GetProvider<IRootProvider>() is not null).AsComBool();
+        private IRootProvider RootProvider => GetProvider<IRootProvider>();
+        private IExpandCollapseProvider ExpandCollapseProvider => GetProvider<IExpandCollapseProvider>();
+        private IInvokeProvider InvokeProvider => GetProvider<IInvokeProvider>();
+        private IRangeValueProvider RangeValueProvider => GetProvider<IRangeValueProvider>();
+        private ISelectionItemProvider SelectionItemProvider => GetProvider<ISelectionItemProvider>();
+        private IToggleProvider ToggleProvider => GetProvider<IToggleProvider>();
+        private IValueProvider ValueProvider => GetProvider<IValueProvider>();
 
-        public IAvnWindowBase? RootProvider_GetWindow()
-        {
-            if (((IRootProvider)_inner).PlatformImpl is WindowBaseImpl impl)
-                return impl.Native;
-            return null;
-        }
-        
-        public IAvnAutomationPeer? RootProvider_GetFocus() => Wrap(((IRootProvider)_inner).GetFocus());
+        public int IsRootProvider() => IsProvider<IRootProvider>();
+
+        public IAvnWindowBase? RootProvider_GetWindow() => (RootProvider.PlatformImpl as WindowBaseImpl)?.Native;
+        public IAvnAutomationPeer? RootProvider_GetFocus() => Wrap(RootProvider.GetFocus());
 
         public IAvnAutomationPeer? RootProvider_GetPeerFromPoint(AvnPoint point)
         {
-            var result = ((IRootProvider)_inner).GetPeerFromPoint(point.ToAvaloniaPoint());
+            var result = RootProvider.GetPeerFromPoint(point.ToAvaloniaPoint());
 
             if (result is null)
                 return null;
@@ -104,46 +106,54 @@ namespace Avalonia.Native
             return Wrap(result);
         }
 
-        public int IsExpandCollapseProvider() => (_inner.GetProvider<IExpandCollapseProvider>() is not null).AsComBool();
+        public int IsExpandCollapseProvider() => IsProvider<IExpandCollapseProvider>();
 
-        public int ExpandCollapseProvider_GetIsExpanded() => ((IExpandCollapseProvider)_inner).ExpandCollapseState switch
+        public int ExpandCollapseProvider_GetIsExpanded() => ExpandCollapseProvider.ExpandCollapseState switch
         {
             ExpandCollapseState.Expanded => 1,
             ExpandCollapseState.PartiallyExpanded => 1,
             _ => 0,
         };
 
-        public int ExpandCollapseProvider_GetShowsMenu() => ((IExpandCollapseProvider)_inner).ShowsMenu.AsComBool();
-        public void ExpandCollapseProvider_Expand() => ((IExpandCollapseProvider)_inner).Expand();
-        public void ExpandCollapseProvider_Collapse() => ((IExpandCollapseProvider)_inner).Collapse();
+        public int ExpandCollapseProvider_GetShowsMenu() => ExpandCollapseProvider.ShowsMenu.AsComBool();
+        public void ExpandCollapseProvider_Expand() => ExpandCollapseProvider.Expand();
+        public void ExpandCollapseProvider_Collapse() => ExpandCollapseProvider.Collapse();
 
-        public int IsInvokeProvider() => (_inner is IInvokeProvider).AsComBool();
-        public void InvokeProvider_Invoke() => ((IInvokeProvider)_inner).Invoke();
+        public int IsInvokeProvider() => IsProvider<IInvokeProvider>();
+        public void InvokeProvider_Invoke() => InvokeProvider.Invoke();
 
-        public int IsRangeValueProvider() => (_inner is IRangeValueProvider).AsComBool();
-        public double RangeValueProvider_GetValue() => ((IRangeValueProvider)_inner).Value;
-        public double RangeValueProvider_GetMinimum() => ((IRangeValueProvider)_inner).Minimum;
-        public double RangeValueProvider_GetMaximum() => ((IRangeValueProvider)_inner).Maximum;
-        public double RangeValueProvider_GetSmallChange() => ((IRangeValueProvider)_inner).SmallChange;
-        public double RangeValueProvider_GetLargeChange() => ((IRangeValueProvider)_inner).LargeChange;
-        public void RangeValueProvider_SetValue(double value) => ((IRangeValueProvider)_inner).SetValue(value);
+        public int IsRangeValueProvider() => IsProvider<IRangeValueProvider>();
+        public double RangeValueProvider_GetValue() => RangeValueProvider.Value;
+        public double RangeValueProvider_GetMinimum() => RangeValueProvider.Minimum;
+        public double RangeValueProvider_GetMaximum() => RangeValueProvider.Maximum;
+        public double RangeValueProvider_GetSmallChange() => RangeValueProvider.SmallChange;
+        public double RangeValueProvider_GetLargeChange() => RangeValueProvider.LargeChange;
+        public void RangeValueProvider_SetValue(double value) => RangeValueProvider.SetValue(value);
 
-        public int IsSelectionItemProvider() => (_inner.GetProvider<ISelectionItemProvider>() is not null).AsComBool();
-        public int SelectionItemProvider_IsSelected() => ((ISelectionItemProvider)_inner).IsSelected.AsComBool();
+        public int IsSelectionItemProvider() => IsProvider<ISelectionItemProvider>();
+        public int SelectionItemProvider_IsSelected() => SelectionItemProvider.IsSelected.AsComBool();
         
-        public int IsToggleProvider() => (_inner.GetProvider<IToggleProvider>() is not null).AsComBool();
-        public int ToggleProvider_GetToggleState() => (int)((IToggleProvider)_inner).ToggleState;
-        public void ToggleProvider_Toggle() => ((IToggleProvider)_inner).Toggle();
+        public int IsToggleProvider() => IsProvider<IToggleProvider>();
+        public int ToggleProvider_GetToggleState() => (int)ToggleProvider.ToggleState;
+        public void ToggleProvider_Toggle() => ToggleProvider.Toggle();
 
-        public int IsValueProvider() => (_inner.GetProvider<IValueProvider>() is not null).AsComBool();
-        public IAvnString ValueProvider_GetValue() => ((IValueProvider)_inner).Value.ToAvnString();
-        public void ValueProvider_SetValue(string value) => ((IValueProvider)_inner).SetValue(value);
+        public int IsValueProvider() => IsProvider<IValueProvider>();
+        public IAvnString ValueProvider_GetValue() => ValueProvider.Value.ToAvnString();
+        public void ValueProvider_SetValue(string value) => ValueProvider.SetValue(value);
 
         [return: NotNullIfNotNull("peer")]
         public static AvnAutomationPeer? Wrap(AutomationPeer? peer)
         {
             return peer is null ? null : s_wrappers.GetValue(peer, x => new(peer));
         }
+
+        private T GetProvider<T>()
+        {
+            return _inner.GetProvider<T>() ?? throw new InvalidOperationException(
+                $"The peer {_inner} does not implement {typeof(T)}.");
+        }
+
+        private int IsProvider<T>() => (_inner.GetProvider<T>() is not null).AsComBool();
     }
 
     internal class AvnAutomationPeerArray : NativeCallbackBase, IAvnAutomationPeerArray

From 6b68a8e5c6480edb095c33d0fd744e01ef2c4637 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 26 Jul 2023 19:09:33 +0200
Subject: [PATCH 23/80] More fixing of provider resolution.

Found a few more places that were doing casts instead of calling `GetProvider<T>()`.
---
 .../Automation/Peers/ItemsControlAutomationPeer.cs              | 2 +-
 .../Automation/Peers/ListItemAutomationPeer.cs                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
index db16bf0a53..64727c43c5 100644
--- a/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Automation.Peers
                 if (!_searchedForScrollable)
                 {
                     if (Owner.GetValue(ListBox.ScrollProperty) is Control scrollable)
-                        _scroller = GetOrCreate(scrollable) as IScrollProvider;
+                        _scroller = GetOrCreate(scrollable).GetProvider<IScrollProvider>();
                     _searchedForScrollable = true;
                 }
 
diff --git a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
index aea91b5e26..dab8c45567 100644
--- a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Automation.Peers
                 if (Owner.Parent is Control parent)
                 {
                     var parentPeer = GetOrCreate(parent);
-                    return parentPeer as ISelectionProvider;
+                    return parentPeer.GetProvider<ISelectionProvider>();
                 }
 
                 return null;

From 8ffbb2a214150830c278aff0c60d45d196594548 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 26 Jul 2023 19:52:36 +0200
Subject: [PATCH 24/80] More fixing of provider resolution.

Arrgh! Forgot to save the file.
---
 src/Avalonia.Native/AvnAutomationPeer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 8069ac76bf..76cae2684f 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -62,7 +62,7 @@ namespace Avalonia.Native
                 var peer = _inner;
                 var parent = peer.GetParent();
 
-                while (peer is not IRootProvider && parent is not null)
+                while (peer.GetProvider<IRootProvider>() is null && parent is not null)
                 {
                     peer = parent;
                     parent = peer.GetParent();

From 02789d2d48e442997d70a5eba024d02094fcb554 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 00:19:37 +0200
Subject: [PATCH 25/80] Revert "Allow embedded root automation peers."

This reverts commit 0e7b8f6f4589195ae35e933c64f89f9478832fb1. The code is in the wrong place.
---
 .../Avalonia.Win32/Automation/RootAutomationNode.cs  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
index 0a73c8bc7b..739f0ac251 100644
--- a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Win32.Automation
                 return null;
 
             var p = WindowImpl.PointToClient(new PixelPoint((int)x, (int)y));
-            var found = InvokeSync(() => GetPeerFromPoint(p));
+            var found = InvokeSync(() => Peer.GetPeerFromPoint(p));
             var result = GetOrCreate(found) as IRawElementProviderFragment;
             return result;
         }
@@ -101,15 +101,5 @@ namespace Avalonia.Win32.Automation
                 return result;
             }
         }
-
-        private AutomationPeer? GetPeerFromPoint(Point p)
-        {
-            var hit = Peer.GetPeerFromPoint(p);
-
-            while (hit != Peer && hit?.GetProvider<IRootProvider>() is { } embeddedRoot)
-                hit = embeddedRoot.GetPeerFromPoint(p);
-                
-            return hit;
-        }
     }
 }

From 0c7c315a10c114427e7a6514bf37949aeaf34122 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 00:23:19 +0200
Subject: [PATCH 26/80] Hit-test embedded root automation peers.

---
 .../Peers/WindowBaseAutomationPeer.cs           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
index 9ec65592fa..3786ba32c7 100644
--- a/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using Avalonia.Automation.Provider;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -32,7 +33,21 @@ namespace Avalonia.Automation.Peers
         public AutomationPeer? GetPeerFromPoint(Point p)
         {
             var hit = Owner.GetVisualAt(p)?.FindAncestorOfType<Control>(includeSelf: true);
-            return hit is object ? GetOrCreate(hit) : null;
+
+            if (hit is null)
+                return null;
+
+            var peer = GetOrCreate(hit);
+
+            while (peer != this && peer.GetProvider<IRootProvider>() is { } embedded)
+            {
+                var embeddedHit = embedded.GetPeerFromPoint(p);
+                if (embeddedHit is null)
+                    break;
+                peer = embeddedHit;
+            }
+
+            return peer;
         }
 
         protected void StartTrackingFocus()

From b7fcb141420001364d7a06efced40dfe2d357e93 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:53:44 +0200
Subject: [PATCH 27/80] Added IEmbeddedRootProvider.

For some reason, on win32 embedded `IRawElementProviderFragmentRoot`s just don't show up, so we need an interface to distinguish between "actual" root peers and "embedded" root peers. Ideally `IRootProvider` and `IEmbeddedRootProvider` would share a common interface but that would be a breaking change.
---
 .../Peers/WindowBaseAutomationPeer.cs         |  2 +-
 .../Provider/IEmbeddedRootProvider.cs         | 33 +++++++++
 .../Automation/Provider/IRootProvider.cs      | 25 +++++++
 .../Automation/AutomationNode.cs              | 69 +++++++++++--------
 .../Automation/RootAutomationNode.cs          | 48 ++-----------
 5 files changed, 108 insertions(+), 69 deletions(-)
 create mode 100644 src/Avalonia.Controls/Automation/Provider/IEmbeddedRootProvider.cs

diff --git a/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
index 3786ba32c7..ceb695422d 100644
--- a/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/WindowBaseAutomationPeer.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Automation.Peers
 
             var peer = GetOrCreate(hit);
 
-            while (peer != this && peer.GetProvider<IRootProvider>() is { } embedded)
+            while (peer != this && peer.GetProvider<IEmbeddedRootProvider>() is { } embedded)
             {
                 var embeddedHit = embedded.GetPeerFromPoint(p);
                 if (embeddedHit is null)
diff --git a/src/Avalonia.Controls/Automation/Provider/IEmbeddedRootProvider.cs b/src/Avalonia.Controls/Automation/Provider/IEmbeddedRootProvider.cs
new file mode 100644
index 0000000000..1b1caef182
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Provider/IEmbeddedRootProvider.cs
@@ -0,0 +1,33 @@
+using System;
+using Avalonia.Automation.Peers;
+
+namespace Avalonia.Automation.Provider
+{
+    /// <summary>
+    /// Exposure methods and properties to support UI Automation client access to the root of an
+    /// automation tree hosted by another UI framework.
+    /// </summary>
+    /// <remarks>
+    /// This interface is implemented by the <see cref="AutomationPeer"/> class, and can be used
+    /// to embed an automation tree from a 3rd party UI framework that wishes to use Avalonia's
+    /// automation support.
+    /// </remarks>
+    public interface IEmbeddedRootProvider
+    {
+        /// <summary>
+        /// Gets the currently focused element.
+        /// </summary>
+        AutomationPeer? GetFocus();
+
+        /// <summary>
+        /// Gets the element at the specified point, expressed in top-level coordinates.
+        /// </summary>
+        /// <param name="p">The point.</param>
+        AutomationPeer? GetPeerFromPoint(Point p);
+
+        /// <summary>
+        /// Raised by the automation peer when the focus changes.
+        /// </summary>
+        event EventHandler? FocusChanged;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs b/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs
index ce38059559..6a266da5c5 100644
--- a/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs
+++ b/src/Avalonia.Controls/Automation/Provider/IRootProvider.cs
@@ -4,11 +4,36 @@ using Avalonia.Platform;
 
 namespace Avalonia.Automation.Provider
 {
+    /// <summary>
+    /// Exposes methods and properties to support UI Automation client access to the root of an
+    /// automation tree.
+    /// </summary>
+    /// <remarks>
+    /// This interface is implemented by the <see cref="AutomationPeer"/> class, and should only
+    /// be implemented on true root elements, such as Windows. To embed an automation tree, use
+    /// <see cref="IEmbeddedRootProvider"/> instead.
+    /// </remarks>
     public interface IRootProvider
     {
+        /// <summary>
+        /// Gets the platform implementation of the TopLevel for the element.
+        /// </summary>
         ITopLevelImpl? PlatformImpl { get; }
+
+        /// <summary>
+        /// Gets the currently focused element.
+        /// </summary>
         AutomationPeer? GetFocus();
+
+        /// <summary>
+        /// Gets the element at the specified point, expressed in top-level coordinates.
+        /// </summary>
+        /// <param name="p">The point.</param>
         AutomationPeer? GetPeerFromPoint(Point p);
+
+        /// <summary>
+        /// Raised by the automation peer when the focus changes.
+        /// </summary>
         event EventHandler? FocusChanged;
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
index 3eeedc4b5d..e835c6a57a 100644
--- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
@@ -54,25 +54,11 @@ namespace Avalonia.Win32.Automation
             _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();
-        }
+            peer.ChildrenChanged += OnPeerChildrenChanged;
+            peer.PropertyChanged += OnPeerPropertyChanged;
 
-        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);
-            }
+            if (Peer.GetProvider<AAP.IEmbeddedRootProvider>() is { } embeddedRoot)
+                embeddedRoot.FocusChanged += OnEmbeddedRootFocusChanged;
         }
 
         public AutomationPeer Peer { get; protected set; }
@@ -95,15 +81,6 @@ namespace Avalonia.Win32.Automation
         public virtual IRawElementProviderSimple? HostRawElementProvider => null;
         public ProviderOptions ProviderOptions => ProviderOptions.ServerSideProvider;
 
-        public void ChildrenChanged()
-        {
-            UiaCoreProviderApi.UiaRaiseStructureChangedEvent(
-                this,
-                StructureChangeType.ChildrenInvalidated,
-                null,
-                0);
-        }
-
         [return: MarshalAs(UnmanagedType.IUnknown)]
         public virtual object? GetPatternProvider(int patternId)
         {
@@ -250,6 +227,21 @@ namespace Avalonia.Win32.Automation
             throw new NotSupportedException();
         }
 
+        protected void RaiseChildrenChanged()
+        {
+            UiaCoreProviderApi.UiaRaiseStructureChangedEvent(
+                this,
+                StructureChangeType.ChildrenInvalidated,
+                null,
+                0);
+        }
+
+        protected void RaiseFocusChanged(AutomationNode? focused)
+        {
+            UiaCoreProviderApi.UiaRaiseAutomationEvent(
+                focused,
+                (int)UiaEventId.AutomationFocusChanged);
+        }
 
         private AutomationNode? GetRoot()
         {
@@ -267,6 +259,29 @@ namespace Avalonia.Win32.Automation
             return peer is object ? GetOrCreate(peer) : null;
         }
 
+        private void OnPeerChildrenChanged(object? sender, EventArgs e)
+        {
+            RaiseChildrenChanged();
+        }
+
+        private void OnPeerPropertyChanged(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);
+            }
+        }
+
+        private void OnEmbeddedRootFocusChanged(object? sender, EventArgs e)
+        {
+            if (Peer.GetProvider<AAP.IEmbeddedRootProvider>() is { } embeddedRoot)
+                RaiseFocusChanged(GetOrCreate(embeddedRoot.GetFocus()));
+        }
+
         private static AutomationNode Create(AutomationPeer peer)
         {
             return peer.GetProvider<AAP.IRootProvider>() is object ?
diff --git a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
index 739f0ac251..7334186c80 100644
--- a/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/RootAutomationNode.cs
@@ -9,18 +9,14 @@ using Avalonia.Win32.Interop.Automation;
 namespace Avalonia.Win32.Automation
 {
     [RequiresUnreferencedCode("Requires .NET COM interop")]
-    internal class RootAutomationNode : AutomationNode,
-        IRawElementProviderFragmentRoot,
-        IRawElementProviderAdviseEvents
+    internal class RootAutomationNode : AutomationNode, IRawElementProviderFragmentRoot
     {
-        private int _raiseFocusChanged;
-
         public RootAutomationNode(AutomationPeer peer)
             : base(peer)
         {
             Peer = base.Peer.GetProvider<IRootProvider>() ?? throw new AvaloniaInternalException(
                 "Attempt to create RootAutomationNode from peer which does not implement IRootProvider.");
-            Peer.FocusChanged += FocusChanged;
+            Peer.FocusChanged += OnRootFocusChanged;
         }
 
         public override IRawElementProviderFragmentRoot? FragmentRoot => this;
@@ -44,41 +40,6 @@ 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()));
-        }
-
         public Rect ToScreen(Rect rect)
         {
             if (WindowImpl is null)
@@ -101,5 +62,10 @@ namespace Avalonia.Win32.Automation
                 return result;
             }
         }
+
+        private void OnRootFocusChanged(object? sender, EventArgs e)
+        {
+            RaiseFocusChanged(GetOrCreate(Peer.GetFocus()));
+        }
     }
 }

From 4fc2a0dfe799c7d944ad7bd114185cca362cd7a6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:04:45 +0200
Subject: [PATCH 28/80] Add IEmbeddedRootProvider to AvnAutomationPeer.

---
 src/Avalonia.Native/AvnAutomationPeer.cs | 29 +++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 76cae2684f..5933dc6c92 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -72,10 +72,11 @@ namespace Avalonia.Native
             }
         }
 
-        private IRootProvider RootProvider => GetProvider<IRootProvider>();
+        private IEmbeddedRootProvider EmbeddedRootProvider => GetProvider<IEmbeddedRootProvider>();
         private IExpandCollapseProvider ExpandCollapseProvider => GetProvider<IExpandCollapseProvider>();
         private IInvokeProvider InvokeProvider => GetProvider<IInvokeProvider>();
         private IRangeValueProvider RangeValueProvider => GetProvider<IRangeValueProvider>();
+        private IRootProvider RootProvider => GetProvider<IRootProvider>();
         private ISelectionItemProvider SelectionItemProvider => GetProvider<ISelectionItemProvider>();
         private IToggleProvider ToggleProvider => GetProvider<IToggleProvider>();
         private IValueProvider ValueProvider => GetProvider<IValueProvider>();
@@ -106,6 +107,32 @@ namespace Avalonia.Native
             return Wrap(result);
         }
 
+
+        public int IsEmbeddedRootProvider() => IsProvider<IEmbeddedRootProvider>();
+
+        public IAvnAutomationPeer? EmbeddedRootProvider_GetFocus() => Wrap(EmbeddedRootProvider.GetFocus());
+
+        public IAvnAutomationPeer? EmbeddedRootProvider_GetPeerFromPoint(AvnPoint point)
+        {
+            var result = EmbeddedRootProvider.GetPeerFromPoint(point.ToAvaloniaPoint());
+
+            if (result is null)
+                return null;
+
+            // The OSX accessibility APIs expect non-ignored elements when hit-testing.
+            while (!result.IsControlElement())
+            {
+                var parent = result.GetParent();
+
+                if (parent is not null)
+                    result = parent;
+                else
+                    break;
+            }
+
+            return Wrap(result);
+        }
+
         public int IsExpandCollapseProvider() => IsProvider<IExpandCollapseProvider>();
 
         public int ExpandCollapseProvider_GetIsExpanded() => ExpandCollapseProvider.ExpandCollapseState switch

From c1645ca31ae595a1bed83413aba59020d011d24c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:37:37 +0200
Subject: [PATCH 29/80] Allow an AutomationPeer to override its visual root.

This is needed for example when a UI framework hosts a peer in the automation tree of a main window whose control is actually hosted in a popup. It allows the bounding rectangle to be calculated correctly in that case.

s
---
 .../Automation/Peers/AutomationPeer.cs        | 23 ++++++++++++++++++-
 .../Automation/AutomationNode.cs              | 16 +++----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
index 3d3fe35d29..a264909ba6 100644
--- a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
@@ -115,9 +115,14 @@ namespace Avalonia.Automation.Peers
         /// <summary>
         /// Gets the <see cref="AutomationPeer"/> that is the parent of this <see cref="AutomationPeer"/>.
         /// </summary>
-        /// <returns></returns>
         public AutomationPeer? GetParent() => GetParentCore();
 
+        /// <summary>
+        /// Gets the <see cref="AutomationPeer"/> that is the root of this <see cref="AutomationPeer"/>'s
+        /// visual tree.
+        /// </summary>
+        public AutomationPeer? GetVisualRoot() => GetVisualRootCore();
+
         /// <summary>
         /// Gets a value that indicates whether the element that is associated with this automation
         /// peer currently has keyboard focus.
@@ -247,6 +252,22 @@ namespace Avalonia.Automation.Peers
             return GetAutomationControlTypeCore();
         }
 
+        protected virtual AutomationPeer? GetVisualRootCore()
+        {
+            var parent = GetParent();
+
+            while (parent != null)
+            {
+                var nextParent = parent.GetParent();
+                if (nextParent == null)
+                    return parent;
+                parent = nextParent;
+            }
+
+            return null;
+        }
+
+
         protected virtual bool IsContentElementOverrideCore()
         {
             return IsControlElement() && IsContentElementCore();
diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
index e835c6a57a..569f7da738 100644
--- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
+++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.cs
@@ -75,7 +75,7 @@ namespace Avalonia.Win32.Automation
 
         public virtual IRawElementProviderFragmentRoot? FragmentRoot
         {
-            get => InvokeSync(() => GetRoot()) as IRawElementProviderFragmentRoot;
+            get => InvokeSync(() => GetRoot());
         }
 
         public virtual IRawElementProviderSimple? HostRawElementProvider => null;
@@ -243,20 +243,10 @@ namespace Avalonia.Win32.Automation
                 (int)UiaEventId.AutomationFocusChanged);
         }
 
-        private AutomationNode? GetRoot()
+        private RootAutomationNode? GetRoot()
         {
             Dispatcher.UIThread.VerifyAccess();
-
-            var peer = Peer;
-            var parent = peer.GetParent();
-
-            while (peer.GetProvider<AAP.IRootProvider>() is null && parent is object)
-            {
-                peer = parent;
-                parent = peer.GetParent();
-            }
-
-            return peer is object ? GetOrCreate(peer) : null;
+            return GetOrCreate(Peer.GetVisualRoot()) as RootAutomationNode;
         }
 
         private void OnPeerChildrenChanged(object? sender, EventArgs e)

From 651f558b67578971a981cdcba479ecb5783cd74b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:58:16 +0200
Subject: [PATCH 30/80] Added new members to IAvnAutomationPeer.

---
 src/Avalonia.Native/AvnAutomationPeer.cs | 1 +
 src/Avalonia.Native/avn.idl              | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 5933dc6c92..d2d93b69a9 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -39,6 +39,7 @@ namespace Avalonia.Native
         public IAvnAutomationPeer? LabeledBy => Wrap(_inner.GetLabeledBy());
         public IAvnString Name => _inner.GetName().ToAvnString();
         public IAvnAutomationPeer? Parent => Wrap(_inner.GetParent());
+        public IAvnAutomationPeer? VisualRoot => Wrap(_inner.GetVisualRoot());
 
         public int HasKeyboardFocus() => _inner.HasKeyboardFocus().AsComBool();
         public int IsContentElement() => _inner.IsContentElement().AsComBool();
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index bc372bbcb5..0911e5ffff 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -921,6 +921,7 @@ interface IAvnAutomationPeer : IUnknown
      IAvnAutomationPeer* GetLabeledBy();
      IAvnString* GetName();
      IAvnAutomationPeer* GetParent();
+     IAvnAutomationPeer* GetVisualRoot();
      bool HasKeyboardFocus();
      bool IsContentElement();
      bool IsControlElement();
@@ -935,7 +936,11 @@ interface IAvnAutomationPeer : IUnknown
      IAvnWindowBase* RootProvider_GetWindow();
      IAvnAutomationPeer* RootProvider_GetFocus();
      IAvnAutomationPeer* RootProvider_GetPeerFromPoint(AvnPoint point);
-     
+
+     bool IsEmbeddedRootProvider();
+     IAvnAutomationPeer* EmbeddedRootProvider_GetFocus();
+     IAvnAutomationPeer* EmbeddedRootProvider_GetPeerFromPoint(AvnPoint point);
+
      bool IsExpandCollapseProvider();
      bool ExpandCollapseProvider_GetIsExpanded();
      bool ExpandCollapseProvider_GetShowsMenu();

From 1b2d3948d07da0c6569b90b7634d58fcba2d3bd2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 28 Jul 2023 00:41:16 +0200
Subject: [PATCH 31/80] Fix accessibilityWindow.

Seems it was broken before and always would have returned null.
---
 native/Avalonia.Native/src/OSX/automation.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index 4b325a092d..9fe0ff3c60 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -291,8 +291,8 @@ private:
 
 - (id)accessibilityWindow
 {
-    id topLevel = [self accessibilityTopLevelUIElement];
-    return [topLevel isKindOfClass:[NSWindow class]] ? topLevel : nil;
+    auto rootPeer = _peer->GetVisualRoot();
+    return [AvnAccessibilityElement acquire:rootPeer];
 }
 
 - (BOOL)isAccessibilityExpanded

From 953ec9b3ef595336dfbd7ba397c8ef7305635218 Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Fri, 28 Jul 2023 07:38:17 +0300
Subject: [PATCH 32/80] Remove BypassLogicalChildrenManagement and use
 OnPropertyChanged

---
 src/Avalonia.Controls/ContentControl.cs       | 30 ++++++-------------
 .../TransitioningContentControl.cs            |  8 ++---
 .../TransitioningContentControlTests.cs       |  9 ++++--
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index 47f7598900..b278942f84 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -40,11 +40,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
             AvaloniaProperty.Register<ContentControl, VerticalAlignment>(nameof(VerticalContentAlignment));
 
-        static ContentControl()
-        {
-            ContentProperty.Changed.AddClassHandler<ContentControl>((x, e) => x.ContentChanged(e));
-        }
-
         /// <summary>
         /// Gets or sets the content to display.
         /// </summary>
@@ -95,22 +90,20 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         IAvaloniaList<ILogical> IContentPresenterHost.LogicalChildren => LogicalChildren;
 
-        /// <summary>
-        /// Determine whether <see cref="ContentControl"/> manage his LogicalChildren 
-        ///(default behavior) himself, or leaves the management to the inherited control.
-        /// </summary>
-        /// <remarks>
-		/// The default value is false, So the <see cref="ContentControl"/> manages itself, 
-        /// if you want to bypass this behavior and manage LogicalChildren yourself, set 
-        /// the <see cref="BypassLogicalChildrenManagement"/> to true.
-		/// </remarks>
-        protected virtual bool BypassLogicalChildrenManagement => false;
-
         /// <inheritdoc/>
         bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
             return RegisterContentPresenter(presenter);
         }
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ContentProperty)
+            {
+                ContentChanged(change);
+            }
+        }
 
         /// <summary>
         /// Called when an <see cref="ContentPresenter"/> is registered with the control.
@@ -129,11 +122,6 @@ namespace Avalonia.Controls
 
         private void ContentChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if (BypassLogicalChildrenManagement)
-            {
-                return;
-            }
-            
             if (e.OldValue is ILogical oldChild)
             {
                 LogicalChildren.Remove(oldChild);
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index c113afde17..0b04866d64 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -36,9 +36,6 @@ public class TransitioningContentControl : ContentControl
         set => SetValue(PageTransitionProperty, value);
     }
 
-    /// <inheritdoc/>
-    protected override bool BypassLogicalChildrenManagement => true;
-
     protected override Size ArrangeOverride(Size finalSize)
     {
         var result = base.ArrangeOverride(finalSize);
@@ -101,12 +98,13 @@ public class TransitioningContentControl : ContentControl
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
-        base.OnPropertyChanged(change);
-
         if (change.Property == ContentProperty)
         {
             UpdateContent(true);
+            return;
         }
+
+        base.OnPropertyChanged(change);
     }
 
     private void UpdateContent(bool withTransition)
diff --git a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
index 210b24b3ad..47e53676d8 100644
--- a/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TransitioningContentControlTests.cs
@@ -184,7 +184,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Logical_Children_Dont_Duplicated()
+        public void Logical_Children_Should_Not_Be_Duplicated()
         {
             using var app = Start();
             var (target, transition) = CreateTarget("");
@@ -194,18 +194,21 @@ namespace Avalonia.Controls.UnitTests
             target.Content = childControl;
 
             Assert.Equal(1, target.LogicalChildren.Count);
+            Assert.Equal(target.LogicalChildren[0], childControl);
         }
 
         [Fact]
-        public void First_Presenter_Register_TCC_As_Host()
+        public void First_Presenter_Should_Register_TCC_As_His_Host()
         {
             using var app = Start();
             var (target, transition) = CreateTarget("");
+            target.PageTransition = null;
 
             var childControl = new Control();
             target.Presenter!.Content = childControl;
 
-            Assert.Contains(childControl, target.LogicalChildren);
+            Assert.Equal(1, target.LogicalChildren.Count);
+            Assert.Equal(target.LogicalChildren[0], childControl);
         }
 
         private static IDisposable Start()

From b780c77260fa806bfc288e41ad46070785f758f9 Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Fri, 28 Jul 2023 07:39:28 +0300
Subject: [PATCH 33/80] typo

---
 src/Avalonia.Controls/ContentControl.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index b278942f84..3564ce1faa 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -95,6 +95,7 @@ namespace Avalonia.Controls
         {
             return RegisterContentPresenter(presenter);
         }
+        
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);

From 90e3760c0f8e1c346a4b9d2d0f5a17f0fadbef9d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 28 Jul 2023 09:19:42 +0200
Subject: [PATCH 34/80] Use interface instead of concrete class.

---
 src/Avalonia.Native/AvnAutomationPeer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index d2d93b69a9..af4958b02f 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -22,8 +22,8 @@ namespace Avalonia.Native
         {
             _inner = inner;
             _inner.ChildrenChanged += (_, _) => Node?.ChildrenChanged();
-            if (inner is WindowBaseAutomationPeer window)
-                window.FocusChanged += (_, _) => Node?.FocusChanged(); 
+            if (inner is IRootProvider root)
+                root.FocusChanged += (_, _) => Node?.FocusChanged(); 
         }
 
         ~AvnAutomationPeer() => Node?.Dispose();

From ae82bc1b8f39362dbfec7412c2a5381a92998359 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 28 Jul 2023 11:19:57 +0200
Subject: [PATCH 35/80] Fix GetVisualRootCore.

Needs to check for `IRootProvider`. Fixes integration tests on Windows.
---
 .../Automation/Peers/AutomationPeer.cs             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
index a264909ba6..fb7cdd87ed 100644
--- a/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/AutomationPeer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Automation.Provider;
 
 namespace Avalonia.Automation.Peers
 {
@@ -254,17 +255,16 @@ namespace Avalonia.Automation.Peers
 
         protected virtual AutomationPeer? GetVisualRootCore()
         {
-            var parent = GetParent();
+            var peer = this;
+            var parent = peer.GetParent();
 
-            while (parent != null)
+            while (peer.GetProvider<IRootProvider>() is null && parent is not null)
             {
-                var nextParent = parent.GetParent();
-                if (nextParent == null)
-                    return parent;
-                parent = nextParent;
+                peer = parent;
+                parent = peer.GetParent();
             }
 
-            return null;
+            return peer;
         }
 
 

From 6b3db2a3f56231075042983d01272605974a6dee Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 28 Jul 2023 13:15:30 +0200
Subject: [PATCH 36/80] Shortcut finding the visual root for controls.

---
 .../Automation/Peers/ControlAutomationPeer.cs              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
index c19d887230..69f267a605 100644
--- a/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ControlAutomationPeer.cs
@@ -120,6 +120,13 @@ namespace Avalonia.Automation.Peers
             return _parent;
         }
 
+        protected override AutomationPeer? GetVisualRootCore()
+        {
+            if (Owner.GetVisualRoot() is Control c)
+                return CreatePeerForElement(c);
+            return null;
+        }
+
         /// <summary>
         /// Invalidates the peer's children and causes a re-read from <see cref="GetChildrenCore"/>.
         /// </summary>

From 8328cc79e2bbe0d1b038d689a47df1ddea907665 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 8 Aug 2023 15:25:00 +0600
Subject: [PATCH 37/80] Unwrap win32 data object

---
 src/Windows/Avalonia.Win32/DataObject.cs    | 1 +
 src/Windows/Avalonia.Win32/OleDropTarget.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
index a215a0a322..df19cdc329 100644
--- a/src/Windows/Avalonia.Win32/DataObject.cs
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -103,6 +103,7 @@ namespace Avalonia.Win32
 
 
         private IDataObject _wrapped;
+        public IDataObject Wrapped => _wrapped;
 
         public DataObject(IDataObject wrapped)
         {
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index a81652ffc2..94d744301a 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -217,7 +217,7 @@ namespace Avalonia.Win32
 
             if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject)
             {
-                return dataObject;
+                return dataObject.Wrapped;
             }
             return new OleDataObject(pDataObj);
         }

From 2c889d558acf18b6e30714a56dc4158d4d9fe647 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 10 Aug 2023 11:28:10 +0100
Subject: [PATCH 38/80] Fixes #YOUTRACK-HDSW-24

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4258572df7..ebfa325067 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.28" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.29" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 11971a0431bdda95581c8f4914c164f87e8acab1 Mon Sep 17 00:00:00 2001
From: adirh <adirh3@gmail.com>
Date: Sat, 12 Aug 2023 16:42:50 +0300
Subject: [PATCH 39/80] Fixed memory leaks in ContextMenu.cs

---
 src/Avalonia.Controls/ContextMenu.cs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index e3a419d7b3..7fab36d931 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -114,7 +114,6 @@ namespace Avalonia.Controls
         /// </summary>
         static ContextMenu()
         {
-            ItemsPanelProperty.OverrideDefaultValue<ContextMenu>(DefaultPanel);
             PlacementProperty.OverrideDefaultValue<ContextMenu>(PlacementMode.Pointer);
             ContextMenuProperty.Changed.Subscribe(ContextMenuChanged);
             AutomationProperties.AccessibilityViewProperty.OverrideDefaultValue<ContextMenu>(AccessibilityView.Control);
@@ -216,16 +215,16 @@ namespace Avalonia.Controls
             if (e.OldValue is ContextMenu oldMenu)
             {
                 control.ContextRequested -= ControlContextRequested;
+                control.AttachedToVisualTree -= ControlOnAttachedToVisualTree;
                 control.DetachedFromVisualTree -= ControlDetachedFromVisualTree;
                 oldMenu._attachedControls?.Remove(control);
                 ((ISetLogicalParent?)oldMenu._popup)?.SetParent(null);
             }
 
-            if (e.NewValue is ContextMenu newMenu)
+            if (e.NewValue is ContextMenu)
             {
-                newMenu._attachedControls ??= new List<Control>();
-                newMenu._attachedControls.Add(control);
                 control.ContextRequested += ControlContextRequested;
+                control.AttachedToVisualTree += ControlOnAttachedToVisualTree;
                 control.DetachedFromVisualTree += ControlDetachedFromVisualTree;
             }
         }
@@ -428,11 +427,20 @@ namespace Avalonia.Controls
                 e.Handled = true;
             }
         }
+        
+        
+        private static void ControlOnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
+        {
+            if (sender is Control { ContextMenu: {} contextMenu } control)
+            {
+                contextMenu._attachedControls ??= new List<Control>();
+                contextMenu._attachedControls.Add(control);
+            }
+        }
 
         private static void ControlDetachedFromVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
         {
-            if (sender is Control control
-                && control.ContextMenu is ContextMenu contextMenu)
+            if (sender is Control { ContextMenu: { } contextMenu } control)
             {
                 if (contextMenu._popup?.Parent == control)
                 {
@@ -440,6 +448,7 @@ namespace Avalonia.Controls
                 }
 
                 contextMenu.Close();
+                contextMenu._attachedControls?.Remove(control);
             }
         }
 

From 5f7d823b59c96473d048f5c66ab098c36bd055bb Mon Sep 17 00:00:00 2001
From: adirh <adirh3@gmail.com>
Date: Sat, 12 Aug 2023 17:26:02 +0300
Subject: [PATCH 40/80] Added unit test

---
 tests/Avalonia.LeakTests/ControlTests.cs | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index ab8e4377b6..9a4bcb1808 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -583,6 +583,48 @@ namespace Avalonia.LeakTests
                     Assert.Equal(initialMenuItemCount, memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount));
             }
         }
+        
+        [Fact]
+        public void Attached_Control_From_ContextMenu_Is_Freed()
+        {
+            using (Start())
+            {
+                var contextMenu = new ContextMenu();
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Content = new TextBlock
+                        {
+                            ContextMenu = contextMenu
+                        }
+                    };
+
+                    window.Show();
+
+                    // Do a layout and make sure that TextBlock gets added to visual tree with
+                    // its render transform.
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    var textBlock = Assert.IsType<TextBlock>(window.Presenter.Child);
+                    Assert.IsType<RotateTransform>(textBlock.RenderTransform);
+
+                    // Clear the content and ensure the TextBlock is removed.
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                // Process all Loaded events to free control reference(s)
+                Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TextBlock>()).ObjectsCount));
+            }
+        }
 
         [Fact]
         public void Standalone_ContextMenu_Is_Freed()

From 1d484685370d7ddb60259b74f1f24630a975f17b Mon Sep 17 00:00:00 2001
From: adirh <adirh3@gmail.com>
Date: Sat, 12 Aug 2023 17:30:51 +0300
Subject: [PATCH 41/80] Added check for when control already attached to visual
 tree

---
 src/Avalonia.Controls/ContextMenu.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 7fab36d931..6300239e12 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -227,6 +227,11 @@ namespace Avalonia.Controls
                 control.AttachedToVisualTree += ControlOnAttachedToVisualTree;
                 control.DetachedFromVisualTree += ControlDetachedFromVisualTree;
             }
+            
+            if (control.IsAttachedToVisualTree)
+            {
+                AttachControlToContextMenu(control);
+            }
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -431,7 +436,12 @@ namespace Avalonia.Controls
         
         private static void ControlOnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
         {
-            if (sender is Control { ContextMenu: {} contextMenu } control)
+            AttachControlToContextMenu(sender);
+        }
+
+        private static void AttachControlToContextMenu(object? sender)
+        {
+            if (sender is Control { ContextMenu: { } contextMenu } control)
             {
                 contextMenu._attachedControls ??= new List<Control>();
                 contextMenu._attachedControls.Add(control);

From 038c96375037bc9fe5e72382c5697bac73aa18f2 Mon Sep 17 00:00:00 2001
From: adirh <adirh3@gmail.com>
Date: Sat, 12 Aug 2023 21:39:45 +0300
Subject: [PATCH 42/80] Fixed unit test

---
 tests/Avalonia.LeakTests/ControlTests.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 9a4bcb1808..c6f9c5eae0 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -602,11 +602,9 @@ namespace Avalonia.LeakTests
 
                     window.Show();
 
-                    // Do a layout and make sure that TextBlock gets added to visual tree with
-                    // its render transform.
+                    // Do a layout and make sure that TextBlock gets added to visual tree.
                     window.LayoutManager.ExecuteInitialLayoutPass();
-                    var textBlock = Assert.IsType<TextBlock>(window.Presenter.Child);
-                    Assert.IsType<RotateTransform>(textBlock.RenderTransform);
+                    Assert.IsType<TextBlock>(window.Presenter.Child);
 
                     // Clear the content and ensure the TextBlock is removed.
                     window.Content = null;

From ea946b2b7ceb67737fa432d39b5e9af33329a01b Mon Sep 17 00:00:00 2001
From: Flithor <23412916+Flithor@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:22:48 +0800
Subject: [PATCH 43/80] Update Fluent.xaml

---
 .../Themes/Fluent.xaml                        | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 0cc620dae9..e6831faf87 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -170,26 +170,28 @@
                   CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
 
-              <Grid Margin="{TemplateBinding Padding}"
+              <StackPanel Margin="{TemplateBinding Padding}"
                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" MinWidth="{DynamicResource DataGridSortIconMinWidth}" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-                <Path Name="SortIcon"
-                      IsVisible="False"
-                      Grid.Column="1"
-                      Height="12"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Fill="{TemplateBinding Foreground}"
-                      Stretch="Uniform" />
-              </Grid>
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" MinWidth="{DynamicResource DataGridSortIconMinWidth}" />
+                  </Grid.ColumnDefinitions>
+                
+                  <ContentPresenter Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                
+                  <Path Name="SortIcon"
+                        IsVisible="False"
+                        Grid.Column="1"
+                        Height="12"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Fill="{TemplateBinding Foreground}"
+                        Stretch="Uniform" />
+                </Grid>
+              </StackPanel>
 
               <Rectangle Name="VerticalSeparator"
                          Grid.Column="1"

From 2dbe0d717e259934e719e8764219e4f3e706545b Mon Sep 17 00:00:00 2001
From: Flithor <23412916+Flithor@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:27:28 +0800
Subject: [PATCH 44/80] Update Fluent.xaml

---
 src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index e6831faf87..2d40721bbf 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -170,7 +170,7 @@
                   CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
 
-              <StackPanel Margin="{TemplateBinding Padding}"
+              <Panel Margin="{TemplateBinding Padding}"
                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <Grid>
@@ -191,7 +191,7 @@
                         Fill="{TemplateBinding Foreground}"
                         Stretch="Uniform" />
                 </Grid>
-              </StackPanel>
+              </Panel>
 
               <Rectangle Name="VerticalSeparator"
                          Grid.Column="1"

From 7b6ae071d73a37570ca5dff24d580de4c0e9c3b1 Mon Sep 17 00:00:00 2001
From: Rudakov Egor <>
Date: Tue, 15 Aug 2023 18:37:33 +0300
Subject: [PATCH 45/80] Set PreserveSig to true for OleGetClipboard

---
 src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 68f3e3c670..226ed2a406 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -1509,7 +1509,7 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern IntPtr SetClipboardData(ClipboardFormat uFormat, IntPtr hMem);
 
-        [DllImport("ole32.dll", PreserveSig = false)]
+        [DllImport("ole32.dll", PreserveSig = true)]
         public static extern int OleGetClipboard(out IntPtr dataObject);
 
         [DllImport("ole32.dll", PreserveSig = true)]

From 74a5e13d2e20bf3d31238e050c4d5775c7c5b137 Mon Sep 17 00:00:00 2001
From: adirh <adirh3@gmail.com>
Date: Tue, 15 Aug 2023 21:23:42 +0300
Subject: [PATCH 46/80] Trigger devops build again

---
 src/Avalonia.Controls/ContextMenu.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 6300239e12..78f6c5f77d 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -230,7 +230,7 @@ namespace Avalonia.Controls
             
             if (control.IsAttachedToVisualTree)
             {
-                AttachControlToContextMenu(control);
+                AttachControlToContextMenu(control); 
             }
         }
 

From e0ffb920a9926618d49ee8c647cd50367da4653b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 16 Aug 2023 13:26:40 +0100
Subject: [PATCH 47/80] fix macos keydown and textinput events being raised in
 the wrong order.

---
 native/Avalonia.Native/src/OSX/AvnView.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index a4999b8df3..ea6ba93fdb 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -538,10 +538,10 @@
 {
     _lastKeyHandled = false;
         
-    [[self inputContext] handleEvent:event];
+    [self keyboardEvent:event withType:KeyDown];
     
     if(!_lastKeyHandled){
-        [self keyboardEvent:event withType:KeyDown];
+        [[self inputContext] handleEvent:event];
     }
 }
 

From eafaa6e584a5fcffda9ab2546888822c524b8b0d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 16 Aug 2023 16:38:35 +0100
Subject: [PATCH 48/80] remove legacy nuget feed no longer reachable.

---
 NuGet.Config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 7d2bd8abd2..2042fea360 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,8 +3,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-eng" value="https://nuget.avaloniaui.net/repository/avalonia-devdeps/index.json" protocolVersion="3" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />    
     <add key="skiasharp" value="https://aka.ms/skiasharp-eap/index.json" />
   </packageSources>
 </configuration>

From 839de5966b3adc67ee549ee2d4422126194f3e05 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 16 Aug 2023 16:48:30 +0100
Subject: [PATCH 49/80] remove all traces of old api diff.

---
 Avalonia.sln                                        |  1 -
 build/ApiDiff.props                                 | 13 -------------
 src/Avalonia.Base/Avalonia.Base.csproj              |  1 -
 .../Avalonia.Controls.ColorPicker.csproj            |  1 -
 .../Avalonia.Controls.DataGrid.csproj               |  1 -
 .../Avalonia.Controls.ItemsRepeater.csproj          |  1 -
 src/Avalonia.Controls/Avalonia.Controls.csproj      |  1 -
 .../Avalonia.DesignerSupport.csproj                 |  1 -
 src/Avalonia.Desktop/Avalonia.Desktop.csproj        |  1 -
 .../Avalonia.Diagnostics.csproj                     |  1 -
 src/Avalonia.Dialogs/Avalonia.Dialogs.csproj        |  1 -
 src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj  |  1 -
 .../Avalonia.Remote.Protocol.csproj                 |  3 +--
 .../Avalonia.Themes.Fluent.csproj                   |  1 -
 .../Avalonia.Themes.Simple.csproj                   |  1 -
 .../Avalonia.Headless.NUnit.csproj                  |  3 +--
 .../Avalonia.Headless.Vnc.csproj                    |  1 -
 .../Avalonia.Headless.XUnit.csproj                  |  1 -
 .../Avalonia.Headless/Avalonia.Headless.csproj      |  1 -
 .../Avalonia.Markup.Xaml.csproj                     |  1 -
 src/Markup/Avalonia.Markup/Avalonia.Markup.csproj   |  1 -
 21 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 build/ApiDiff.props

diff --git a/Avalonia.sln b/Avalonia.sln
index d5419365ac..98ad0cadae 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -91,7 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "s
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
 	ProjectSection(SolutionItems) = preProject
-		build\ApiDiff.props = build\ApiDiff.props
 		build\AvaloniaPublicKey.props = build\AvaloniaPublicKey.props
 		build\Base.props = build\Base.props
 		build\Binding.props = build\Binding.props
diff --git a/build/ApiDiff.props b/build/ApiDiff.props
deleted file mode 100644
index b0b1942f60..0000000000
--- a/build/ApiDiff.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ApiContractPackageVersion>0.10.0</ApiContractPackageVersion>
-    <NugetPackageName Condition="'$(PackageId)' != ''">$(PackageId)</NugetPackageName>
-    <NugetPackageName Condition="'$(PackageId)' == ''">Avalonia</NugetPackageName>
-    <RunApiCompat Condition="'$(TargetFramework)' == 'net6.0'">false</RunApiCompat>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageDownload Include="$(NugetPackageName)" Version="[$(ApiContractPackageVersion)]" />
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20372.2" PrivateAssets="All" />
-    <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName.ToLowerInvariant())\$(ApiContractPackageVersion)\lib\$(TargetFramework)\$(AssemblyName).dll" />
-  </ItemGroup>
-</Project>
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 16eb09de65..9aeb71f649 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -15,7 +15,6 @@
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Binding.props" />
   <Import Project="..\..\build\System.Memory.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
diff --git a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
index 5a31053bdc..8a36e6900a 100644
--- a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
+++ b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
@@ -17,7 +17,6 @@
   </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <!--<Import Project="..\..\build\ApiDiff.props" />-->
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index 6556ce721e..6c1e019603 100644
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
 
   <ItemGroup Label="InternalsVisibleTo">
diff --git a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
index 1ec0ee33a7..b7739bda8d 100644
--- a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
+++ b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <!--<Import Project="..\..\build\ApiDiff.props" />-->
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 304454777f..0dda861448 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -6,7 +6,6 @@
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
   </ItemGroup>
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index c5255b22cd..0c1b3e8a45 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -19,5 +19,4 @@
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
   </ItemGroup>
-  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
index d180e6e34d..12cc977c84 100644
--- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj
+++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
@@ -12,7 +12,6 @@
       <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
   </ItemGroup>
   
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\NullableEnable.props" />
 </Project>
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 65d1bea298..135bc1b685 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index be4bae26f1..3a2c18ac24 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -19,7 +19,6 @@
     <InternalsVisibleTo Include="ControlCatalog, PublicKey=$(AvaloniaPublicKey)" />    
   </ItemGroup>
   
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
 </Project>
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index 4cae8e82df..30b5d80fbc 100644
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@@ -9,7 +9,6 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index baeb8820f8..13d1ff9651 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -10,6 +10,5 @@
     <Compile Include="..\Avalonia.Base\Input\Key.cs" />
     <Compile Include="..\Avalonia.Base\Compatibility\TrimmingAttributes.cs" Visible="False" />
   </ItemGroup>
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 660661fc94..e62abff18b 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
index 39da9a747f..9864cf24e0 100644
--- a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
+++ b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
   <Import Project="..\..\build\NullableEnable.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
 </Project>
diff --git a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj
index 49f1de31f2..d176d74b5f 100644
--- a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj
+++ b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj
@@ -12,8 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Headless\Avalonia.Headless.csproj" />
   </ItemGroup>
-
-  <Import Project="..\..\..\build\ApiDiff.props" />
+  
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
 </Project>
diff --git a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
index 1f06f28687..2020dca482 100644
--- a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
+++ b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
@@ -10,7 +10,6 @@
       <PackageReference Include="Quamotion.RemoteViewing" Version="1.1.21" />
     </ItemGroup>
 
-    <Import Project="..\..\..\build\ApiDiff.props" />
     <Import Project="..\..\..\build\DevAnalyzers.props" />
     <Import Project="..\..\..\build\TrimmingEnable.props" />
     <Import Project="..\..\..\build\NullableEnable.props" />
diff --git a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj
index 4ab70eb07d..85879faa4c 100644
--- a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj
+++ b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj
@@ -13,7 +13,6 @@
     <ProjectReference Include="..\Avalonia.Headless\Avalonia.Headless.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
 </Project>
diff --git a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
index 893cb0074c..fe071b594f 100644
--- a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
+++ b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
@@ -7,7 +7,6 @@
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 618379757b..d827530207 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -65,7 +65,6 @@
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
   </ItemGroup>
-  <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index d041e7d2e6..29583b6cb8 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -13,7 +13,6 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\System.Memory.props" />
-  <Import Project="..\..\..\build\ApiDiff.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\TrimmingEnable.props" />

From 815545dfcd758ece930125d5072e26c8f421c6dc Mon Sep 17 00:00:00 2001
From: stepan_govorko <stepan.govorko@jetbrains.com>
Date: Wed, 16 Aug 2023 13:13:15 +0200
Subject: [PATCH 50/80] Consider Clip.Bounds in clipping calculation in
 ServerCompositionVisual; In addition, the ServerCompositionVisual now tracks
 changes to the clip property, allowing for re-calculation when the clip is
 altered.

---
 ...ServerCompositionVisual.DirtyProperties.cs |  1 +
 .../Server/ServerCompositionVisual.cs         | 21 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
index c1037d5c67..51414c2250 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
@@ -38,6 +38,7 @@ partial class ServerCompositionVisual
         CompositionVisualChangedFields.Size
         | CompositionVisualChangedFields.SizeAnimated
         | CompositionVisualChangedFields.ClipToBounds
+        | CompositionVisualChangedFields.Clip
         | CompositionVisualChangedFields.ClipToBoundsAnimated;
         
     partial void OnFieldsDeserialized(CompositionVisualChangedFields changed)
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index 45515a37e2..fd1e2165b7 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -182,11 +182,24 @@ namespace Avalonia.Rendering.Composition.Server
 
             if (_clipSizeDirty || positionChanged)
             {
-                _transformedClipBounds = ClipToBounds
-                    ? new Rect(new Size(Size.X, Size.Y))
-                        .TransformToAABB(GlobalTransformMatrix)
-                    : null;
+                Rect? transformedVisualBounds = null;
+                Rect? transformedClipBounds = null;
                 
+                if (ClipToBounds)
+                    transformedVisualBounds = new Rect(new Size(Size.X, Size.Y)).TransformToAABB(GlobalTransformMatrix);
+                
+                 if (Clip != null)
+                     transformedClipBounds = Clip.Bounds.TransformToAABB(GlobalTransformMatrix);
+
+                 if (transformedVisualBounds != null && transformedClipBounds != null)
+                     _transformedClipBounds = transformedVisualBounds.Value.Intersect(transformedClipBounds.Value);
+                 else if (transformedVisualBounds != null)
+                     _transformedClipBounds = transformedVisualBounds;
+                 else if (transformedClipBounds != null)
+                     _transformedClipBounds = transformedClipBounds;
+                 else
+                     _transformedClipBounds = null;
+                 
                 _clipSizeDirty = false;
             }
 

From 77dc35bf469fbc583d9c09add0fa255e9badd1bc Mon Sep 17 00:00:00 2001
From: stepan_govorko <stepan.govorko@jetbrains.com>
Date: Thu, 17 Aug 2023 09:26:25 +0200
Subject: [PATCH 51/80] Introduced counting of rendered visuals in
 ServerCompositionVisual and added relevant unit tests in
 CompositorInvalidationClippingTests. The new tests ensure that visuals that
 are not in dirty rect are rendered correctly with different ClipToBounds and
 Clip geometry parameters.

---
 .../ICompositionTargetDebugEvents.cs          |  2 +
 .../Server/ServerCompositionVisual.cs         |  1 +
 .../CompositorInvalidationClippingTests.cs    | 60 +++++++++++++++++++
 .../CompositorTestServices.cs                 | 17 +++++-
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs

diff --git a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
index c830ca2c49..cfbce221d6 100644
--- a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
@@ -2,5 +2,7 @@ namespace Avalonia.Rendering.Composition;
 
 internal interface ICompositionTargetDebugEvents
 {
+    public int RenderedVisuals { get; }
+    void IncrementRenderedVisuals();
     void RectInvalidated(Rect rc);
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index fd1e2165b7..aeb228282e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -38,6 +38,7 @@ namespace Avalonia.Rendering.Composition.Server
                 return;
 
             Root!.RenderedVisuals++;
+            Root!.DebugEvents?.IncrementRenderedVisuals();
 
             var boundsRect = new Rect(new Size(Size.X, Size.Y));
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs
new file mode 100644
index 0000000000..1de2cfa717
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs
@@ -0,0 +1,60 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Rendering;
+
+public class CompositorInvalidationClippingTests : CompositorTestsBase
+{
+    [Fact]
+    public void Siblings_Should_Be_Rendered_On_Invalidate_Without_ClipToBounds()
+    {
+        AssertRenderedVisuals(clipToBounds: false, clipGeometry: false, expectedRenderedVisualsCount: 4);
+    }
+
+    [Fact]
+    public void Siblings_Should_Not_Be_Rendered_On_Invalidate_With_ClipToBounds()
+    {
+        AssertRenderedVisuals(clipToBounds: true, clipGeometry: false, expectedRenderedVisualsCount: 3);
+    }
+
+    [Fact]
+    public void Siblings_Should_Not_Be_Rendered_On_Invalidate_With_Clip()
+    {
+        AssertRenderedVisuals(clipToBounds: false, clipGeometry: true, expectedRenderedVisualsCount: 3);
+    }
+
+    private void AssertRenderedVisuals(bool clipToBounds, bool clipGeometry, int expectedRenderedVisualsCount)
+    {
+        using (var s = new CompositorCanvas())
+        {
+            //#1 visual to render is root
+            //#2 visual to render is s.Canvas
+            
+            //#3 visual to render
+            s.Canvas.Children.Add(new Border()
+            {
+                [Canvas.LeftProperty] = 0, [Canvas.TopProperty] = 0,
+                Width = 20, Height = 10,
+                Background = Brushes.Red,
+                ClipToBounds = clipToBounds,
+                Clip = clipGeometry ? new RectangleGeometry(new Rect(new Size(20, 10))) : null
+            });
+            
+            //#4 visual to render
+            s.Canvas.Children.Add(new Border()
+            {
+                [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50,
+                Width = 20, Height = 10,
+                Background = Brushes.Red,
+                ClipToBounds = clipToBounds,
+                Clip = clipGeometry ? new RectangleGeometry(new Rect(new Size(20, 10))) : null
+            });
+            s.RunJobs();
+            s.Events.Reset();
+            s.Canvas.Children[0].IsVisible = false;
+            s.RunJobs();
+            s.AssertRenderedVisuals(expectedRenderedVisualsCount);
+        }
+    }
+}
diff --git a/tests/Avalonia.UnitTests/CompositorTestServices.cs b/tests/Avalonia.UnitTests/CompositorTestServices.cs
index 53fd610a17..00645259a5 100644
--- a/tests/Avalonia.UnitTests/CompositorTestServices.cs
+++ b/tests/Avalonia.UnitTests/CompositorTestServices.cs
@@ -89,6 +89,13 @@ public class CompositorTestServices : IDisposable
         Events.Rects.Clear();
     }
 
+    public void AssertRenderedVisuals(int renderVisuals)
+    {
+        RunJobs();
+        Assert.Equal(Events.RenderedVisuals, renderVisuals);
+        Events.Rects.Clear();
+    }
+
     public void AssertHitTest(double x, double y, Func<Visual, bool> filter, params object[] expected)
         => AssertHitTest(new Point(x, y), filter, expected);
 
@@ -110,6 +117,13 @@ public class CompositorTestServices : IDisposable
     {
         public List<Rect> Rects = new();
 
+        public int RenderedVisuals { get; private set; }
+
+        public void IncrementRenderedVisuals()
+        {
+            RenderedVisuals++;
+        }
+
         public void RectInvalidated(Rect rc)
         {
             Rects.Add(rc);
@@ -118,6 +132,7 @@ public class CompositorTestServices : IDisposable
         public void Reset()
         {
             Rects.Clear();
+            RenderedVisuals = 0;
         }
     }
 
@@ -218,4 +233,4 @@ public class DispatcherCompositorScheduler : ICompositorScheduler
     {
         Dispatcher.UIThread.Post(() => compositor.Commit(), DispatcherPriority.UiThreadRender);
     }
-}
\ No newline at end of file
+}

From f5c93a50abb12ce6c1e4bf40200a1eaf916c9f12 Mon Sep 17 00:00:00 2001
From: stepan_govorko <stepan.govorko@jetbrains.com>
Date: Thu, 17 Aug 2023 09:51:04 +0200
Subject: [PATCH 52/80] added more comments

---
 .../CompositorInvalidationClippingTests.cs     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs
index 1de2cfa717..c158ff4e75 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorInvalidationClippingTests.cs
@@ -3,22 +3,27 @@ using Avalonia.Media;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests.Rendering;
-
+/// <summary>
+/// Test class that verifies how clipping influences rendering in the compositor
+/// </summary>
 public class CompositorInvalidationClippingTests : CompositorTestsBase
 {
     [Fact]
+    // Test case: When the ClipToBounds is false, all visuals should be rendered
     public void Siblings_Should_Be_Rendered_On_Invalidate_Without_ClipToBounds()
     {
         AssertRenderedVisuals(clipToBounds: false, clipGeometry: false, expectedRenderedVisualsCount: 4);
     }
 
     [Fact]
+    // Test case: When the ClipToBounds is true, only visuals within the clipped boundary should be rendered
     public void Siblings_Should_Not_Be_Rendered_On_Invalidate_With_ClipToBounds()
     {
         AssertRenderedVisuals(clipToBounds: true, clipGeometry: false, expectedRenderedVisualsCount: 3);
     }
 
     [Fact]
+    // Test case: When the Clip is used, only visuals within the clip geometry should be rendered
     public void Siblings_Should_Not_Be_Rendered_On_Invalidate_With_Clip()
     {
         AssertRenderedVisuals(clipToBounds: false, clipGeometry: true, expectedRenderedVisualsCount: 3);
@@ -28,10 +33,10 @@ public class CompositorInvalidationClippingTests : CompositorTestsBase
     {
         using (var s = new CompositorCanvas())
         {
-            //#1 visual to render is root
-            //#2 visual to render is s.Canvas
+            //#1 visual is top level
+            //#2 visual is s.Canvas
             
-            //#3 visual to render
+            //#3 visual is border1
             s.Canvas.Children.Add(new Border()
             {
                 [Canvas.LeftProperty] = 0, [Canvas.TopProperty] = 0,
@@ -41,7 +46,7 @@ public class CompositorInvalidationClippingTests : CompositorTestsBase
                 Clip = clipGeometry ? new RectangleGeometry(new Rect(new Size(20, 10))) : null
             });
             
-            //#4 visual to render
+            //#4 visual is border2
             s.Canvas.Children.Add(new Border()
             {
                 [Canvas.LeftProperty] = 30, [Canvas.TopProperty] = 50,
@@ -52,8 +57,11 @@ public class CompositorInvalidationClippingTests : CompositorTestsBase
             });
             s.RunJobs();
             s.Events.Reset();
+            
+            //invalidate border1
             s.Canvas.Children[0].IsVisible = false;
             s.RunJobs();
+            
             s.AssertRenderedVisuals(expectedRenderedVisualsCount);
         }
     }

From d64502e2e7c968f1d1140d22f742b8ea948af075 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Thu, 17 Aug 2023 16:21:33 -0400
Subject: [PATCH 53/80] Fix for Track not arranging after IsDirectionReversed
 property changed.

---
 src/Avalonia.Controls/Primitives/Track.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index f9aa5fc7a0..d823455e13 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -52,7 +52,7 @@ namespace Avalonia.Controls.Primitives
             ThumbProperty.Changed.AddClassHandler<Track>((x, e) => x.ThumbChanged(e));
             IncreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
             DecreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
-            AffectsArrange<Track>(MinimumProperty, MaximumProperty, ValueProperty, OrientationProperty);
+            AffectsArrange<Track>(IsDirectionReversedProperty, MinimumProperty, MaximumProperty, ValueProperty, OrientationProperty);
         }
 
         public Track()

From fa6939aa39496bd3e468b2cd6eec090fffc7dda8 Mon Sep 17 00:00:00 2001
From: stepan_govorko <stepan.govorko@jetbrains.com>
Date: Fri, 18 Aug 2023 06:22:27 +0200
Subject: [PATCH 54/80] The unneeded public access modifier was removed from
 the RenderedVisuals property in the ICompositionTargetDebugEvents interface.

---
 .../Rendering/Composition/ICompositionTargetDebugEvents.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
index cfbce221d6..27aca436b8 100644
--- a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
@@ -2,7 +2,7 @@ namespace Avalonia.Rendering.Composition;
 
 internal interface ICompositionTargetDebugEvents
 {
-    public int RenderedVisuals { get; }
+    int RenderedVisuals { get; }
     void IncrementRenderedVisuals();
     void RectInvalidated(Rect rc);
 }

From f8956618790b80d178b04d36bcf9211273ca6c2e Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Fri, 18 Aug 2023 16:08:00 +0800
Subject: [PATCH 56/80] Fix main loop cancellation from another thread

---
 .../src/OSX/platformthreading.mm              | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/platformthreading.mm b/native/Avalonia.Native/src/OSX/platformthreading.mm
index d80df68fea..56b7ce97e0 100644
--- a/native/Avalonia.Native/src/OSX/platformthreading.mm
+++ b/native/Avalonia.Native/src/OSX/platformthreading.mm
@@ -17,7 +17,6 @@ public:
         Cancelled = true;
         if(Running)
         {
-            Running = false;
             if(![NSThread isMainThread])
             {
                 AddRef();
@@ -28,22 +27,22 @@ public:
                 });
                 return;
             };
+
+            Running = false;
             if(IsApp)
                 [NSApp stop:nil];
-            else
-            {
-                // Wakeup the event loop
-                NSEvent* event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
-                                                    location:NSMakePoint(0, 0)
-                                               modifierFlags:0
-                                                   timestamp:0
-                                                windowNumber:0
-                                                     context:nil
-                                                     subtype:0
-                                                       data1:0
-                                                       data2:0];
-                [NSApp postEvent:event atStart:YES];
-            }
+
+            // Wakeup the event loop
+            NSEvent* event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
+                                                location:NSMakePoint(0, 0)
+                                            modifierFlags:0
+                                                timestamp:0
+                                            windowNumber:0
+                                                    context:nil
+                                                    subtype:0
+                                                    data1:0
+                                                    data2:0];
+            [NSApp postEvent:event atStart:YES];
         }
     };
 };

From 09250ec9c4ed78a50fae2143e943bcba85edf0d6 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Fri, 18 Aug 2023 08:47:04 -0400
Subject: [PATCH 57/80] Updated ToggleSplitButton.IsChecked to bind TwoWay by
 default, same as ToggleButton.

---
 src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
index ff8bd5dc0b..e6f0abcad0 100644
--- a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
@@ -2,6 +2,7 @@
 
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
 
@@ -36,8 +37,8 @@ namespace Avalonia.Controls
         /// Defines the <see cref="IsChecked"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsCheckedProperty =
-            AvaloniaProperty.Register<ToggleSplitButton, bool>(
-                nameof(IsChecked));
+            AvaloniaProperty.Register<ToggleSplitButton, bool>(nameof(IsChecked), false,
+                defaultBindingMode: BindingMode.TwoWay);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ToggleSplitButton"/> class.

From 4b5c680a2644cc70ced48953cda0b94ed8bd29f6 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 18 Aug 2023 16:22:27 +0200
Subject: [PATCH 58/80] Introduce RenderOptions.RequiresFullOpacityHandling

---
 src/Avalonia.Base/Media/RenderOptions.cs     | 45 ++++++++++++++++----
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 28 +++++++-----
 2 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Base/Media/RenderOptions.cs b/src/Avalonia.Base/Media/RenderOptions.cs
index 639498543b..1ac2520919 100644
--- a/src/Avalonia.Base/Media/RenderOptions.cs
+++ b/src/Avalonia.Base/Media/RenderOptions.cs
@@ -8,12 +8,13 @@ namespace Avalonia.Media
         public EdgeMode EdgeMode { get; init; }
         public TextRenderingMode TextRenderingMode { get; init; }
         public BitmapBlendingMode BitmapBlendingMode { get; init; }
+        public bool? RequiresFullOpacityHandling { get; init; }
 
         /// <summary>
         /// Gets the value of the BitmapInterpolationMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
+        /// <returns>The value.</returns>
         public static BitmapInterpolationMode GetBitmapInterpolationMode(Visual visual)
         {
             return visual.RenderOptions.BitmapInterpolationMode;
@@ -23,7 +24,7 @@ namespace Avalonia.Media
         /// Sets the value of the BitmapInterpolationMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <param name="value">The left value.</param>
+        /// <param name="value">The value.</param>
         public static void SetBitmapInterpolationMode(Visual visual, BitmapInterpolationMode value)
         {
             visual.RenderOptions = visual.RenderOptions with { BitmapInterpolationMode = value };
@@ -33,7 +34,7 @@ namespace Avalonia.Media
         /// Gets the value of the BitmapBlendingMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
+        /// <returns>The value.</returns>
         public static BitmapBlendingMode GetBitmapBlendingMode(Visual visual)
         {
             return visual.RenderOptions.BitmapBlendingMode;
@@ -53,7 +54,7 @@ namespace Avalonia.Media
         /// Gets the value of the EdgeMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
+        /// <returns>The value.</returns>
         public static EdgeMode GetEdgeMode(Visual visual)
         {
             return visual.RenderOptions.EdgeMode;
@@ -63,7 +64,7 @@ namespace Avalonia.Media
         /// Sets the value of the EdgeMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <param name="value">The left value.</param>
+        /// <param name="value">The value.</param>
         public static void SetEdgeMode(Visual visual, EdgeMode value)
         {
             visual.RenderOptions = visual.RenderOptions with { EdgeMode = value };
@@ -73,7 +74,7 @@ namespace Avalonia.Media
         /// Gets the value of the TextRenderingMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <returns>The control's left coordinate.</returns>
+        /// <returns>The value.</returns>
         public static TextRenderingMode GetTextRenderingMode(Visual visual)
         {
             return visual.RenderOptions.TextRenderingMode;
@@ -83,12 +84,32 @@ namespace Avalonia.Media
         /// Sets the value of the TextRenderingMode attached property for a visual.
         /// </summary>
         /// <param name="visual">The control.</param>
-        /// <param name="value">The left value.</param>
+        /// <param name="value">The value.</param>
         public static void SetTextRenderingMode(Visual visual, TextRenderingMode value)
         {
             visual.RenderOptions = visual.RenderOptions with { TextRenderingMode = value };
         }
 
+        /// <summary>
+        /// Gets the value of the RequiresFullOpacityHandling attached property for a visual.
+        /// </summary>
+        /// <param name="visual">The control.</param>
+        /// <returns>The value.</returns>
+        public static bool? GetRequiresFullOpacityHandling(Visual visual)
+        {
+            return visual.RenderOptions.RequiresFullOpacityHandling;
+        }
+
+        /// <summary>
+        /// Sets the value of the RequiresFullOpacityHandling attached property for a visual.
+        /// </summary>
+        /// <param name="visual">The control.</param>
+        /// <param name="value">The value.</param>
+        public static void SetRequiresFullOpacityHandling(Visual visual, bool? value)
+        {
+            visual.RenderOptions = visual.RenderOptions with { RequiresFullOpacityHandling = value };
+        }
+
         public RenderOptions MergeWith(RenderOptions other)
         {
             var bitmapInterpolationMode = BitmapInterpolationMode;
@@ -119,12 +140,20 @@ namespace Avalonia.Media
                 bitmapBlendingMode = other.BitmapBlendingMode;
             }
 
+            var requiresFullOpacityHandling = RequiresFullOpacityHandling;
+
+            if (requiresFullOpacityHandling == null)
+            {
+                requiresFullOpacityHandling = other.RequiresFullOpacityHandling;
+            }
+
             return new RenderOptions
             {
                 BitmapInterpolationMode = bitmapInterpolationMode,
                 EdgeMode = edgeMode,
                 TextRenderingMode = textRenderingMode,
-                BitmapBlendingMode = bitmapBlendingMode
+                BitmapBlendingMode = bitmapBlendingMode,
+                RequiresFullOpacityHandling = requiresFullOpacityHandling
             };
         }
     }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index fbff4ab4e7..7b5cca0fde 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -189,7 +189,8 @@ namespace Avalonia.Skia
             var d = destRect.ToSKRect();
 
             var paint = SKPaintCache.Shared.Get();
-            paint.Color = new SKColor(255, 255, 255, (byte)(255 * opacity * (_useOpacitySaveLayer ? 1 : _currentOpacity)));
+
+            paint.Color = new SKColor(255, 255, 255, (byte)(255 * opacity * currentOpacity));
             paint.FilterQuality = RenderOptions.BitmapInterpolationMode.ToSKFilterQuality();
             paint.BlendMode = RenderOptions.BitmapBlendingMode.ToSKBlendMode();
 
@@ -375,7 +376,7 @@ namespace Avalonia.Skia
             {
                 if (boxShadow != default && !boxShadow.IsInset)
                 {
-                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _useOpacitySaveLayer ? 1 : _currentOpacity))
+                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
                     {
                         var spread = (float)boxShadow.Spread;
                         if (boxShadow.IsInset)
@@ -432,7 +433,7 @@ namespace Avalonia.Skia
             {
                 if (boxShadow != default && boxShadow.IsInset)
                 {
-                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _useOpacitySaveLayer ? 1 : _currentOpacity))
+                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, currentOpacity))
                     {
                         var spread = (float)boxShadow.Spread;
                         var offsetX = (float)boxShadow.OffsetX;
@@ -592,8 +593,16 @@ namespace Avalonia.Skia
         {
             CheckLease();
 
-            if(_useOpacitySaveLayer)
+            _opacityStack.Push(_currentOpacity);
+
+            var useOpacitySaveLayer = _useOpacitySaveLayer || RenderOptions.RequiresFullOpacityHandling == true;
+
+            if (useOpacitySaveLayer)
             {
+                opacity = _currentOpacity * opacity; //Take current multiplied opacity
+
+                _currentOpacity = 1; //Opacity is applied via layering
+
                 if (bounds.HasValue)
                 {
                     var rect = bounds.Value.ToSKRect();
@@ -606,7 +615,6 @@ namespace Avalonia.Skia
             }
             else
             {
-                _opacityStack.Push(_currentOpacity);
                 _currentOpacity *= opacity;
             }
         }
@@ -616,14 +624,14 @@ namespace Avalonia.Skia
         {
             CheckLease();
 
-            if(_useOpacitySaveLayer)
+            var useOpacitySaveLayer = _useOpacitySaveLayer || RenderOptions.RequiresFullOpacityHandling == true;
+
+            if (useOpacitySaveLayer)
             {
                 Canvas.Restore();
             }
-            else
-            {
-                _currentOpacity = _opacityStack.Pop();
-            }    
+
+            _currentOpacity = _opacityStack.Pop();
         }
 
         /// <inheritdoc />

From 41bef0e991ebd3ffdc7a94725c1d6f66171fb4a5 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Fri, 18 Aug 2023 11:15:00 -0400
Subject: [PATCH 59/80] Fix for TextBox not accounting for space between
 ScrollViewer and TextPresenter when calculating MaxLines-based height

---
 src/Avalonia.Controls/TextBox.cs | 34 +++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 98b3b13c17..8a5ac4e495 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1879,6 +1879,37 @@ namespace Avalonia.Controls
             return text.Substring(start, end - start);
         }
 
+        /// <summary>
+        /// Returns the sum of any vertical whitespace added between the <see cref="ScrollViewer"/> and <see cref="TextPresenter"/> in the control template.
+        /// </summary>
+        /// <returns>The total vertical whitespace.</returns>
+        private double GetVerticalSpaceBetweenScrollViewerAndPresenter()
+        {
+            var verticalSpace = 0.0;
+            if (_presenter != null)
+            {
+                Visual? visual = _presenter;
+                while ((visual != null) && (visual != this))
+                {
+                    if (visual == _scrollViewer)
+                    {
+                        // ScrollViewer is a stopping point and should only include the Padding
+                        verticalSpace += _scrollViewer.Padding.Top + _scrollViewer.Padding.Bottom;
+                        break;
+                    }
+
+                    var margin = visual.GetValue<Thickness>(Layoutable.MarginProperty);
+                    var padding = visual.GetValue<Thickness>(Decorator.PaddingProperty);
+                    
+                    verticalSpace += margin.Top + padding.Top + padding.Bottom + margin.Bottom;
+
+                    visual = visual.VisualParent;
+                }
+            }
+
+            return verticalSpace;
+        }
+
         /// <summary>
         /// Raises both the <see cref="TextChanging"/> and <see cref="TextChanged"/> events.
         /// </summary>
@@ -2032,8 +2063,9 @@ namespace Avalonia.Controls
                     var typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
                     var paragraphProperties = TextLayout.CreateTextParagraphProperties(typeface, fontSize, null, default, default, null, default, LineHeight, default);
                     var textLayout = new TextLayout(new MaxLinesTextSource(MaxLines), paragraphProperties);
+                    var verticalSpace = GetVerticalSpaceBetweenScrollViewerAndPresenter();
 
-                    maxHeight = Math.Ceiling(textLayout.Height);
+                    maxHeight = Math.Ceiling(textLayout.Height + verticalSpace);
                 }
 
                 _scrollViewer.SetCurrentValue(MaxHeightProperty, maxHeight);

From 932b40b19b97c4a75ff7b244464b2a6774e93ac4 Mon Sep 17 00:00:00 2001
From: Boyd Patterson <boyd.patterson@actiprosoftware.com>
Date: Fri, 18 Aug 2023 11:53:42 -0500
Subject: [PATCH 60/80] Added unit tests for TextBox to verify MaxLines
 property assigns the ScrollViewer.MaxHeight based on line height.

---
 .../TextBoxTests.cs                           | 79 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index d4558c9e04..3c7fb6f9c0 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -15,6 +15,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Moq;
 using Xunit;
 
@@ -916,6 +917,82 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        public void MaxLines_Sets_ScrollViewer_MaxHeight(int maxLines)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    MaxLines = maxLines,
+
+                    // Define explicit whole number line height for predictable calculations
+                    LineHeight = 20
+                };
+
+                var impl = CreateMockTopLevelImpl();
+                var topLevel = new TestTopLevel(impl.Object)
+                {
+                    Template = CreateTopLevelTemplate(),
+                    Content = target
+                };
+                topLevel.ApplyTemplate();
+                topLevel.LayoutManager.ExecuteInitialLayoutPass();
+
+                var textPresenter = target.FindDescendantOfType<TextPresenter>();
+                Assert.Equal("PART_TextPresenter", textPresenter.Name);
+                Assert.Equal(new Thickness(0), textPresenter.Margin); // Test assumes no margin on TextPresenter
+
+                var scrollViewer = target.FindDescendantOfType<ScrollViewer>();
+                Assert.Equal("PART_ScrollViewer", scrollViewer.Name);
+                Assert.Equal(maxLines * target.LineHeight, scrollViewer.MaxHeight);
+            }
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        public void MaxLines_Sets_ScrollViewer_MaxHeight_With_TextPresenter_Margin(int maxLines)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    MaxLines = maxLines,
+
+                    // Define explicit whole number line height for predictable calculations
+                    LineHeight = 20
+                };
+
+                var impl = CreateMockTopLevelImpl();
+                var topLevel = new TestTopLevel(impl.Object)
+                {
+                    Template = CreateTopLevelTemplate(),
+                    Content = target
+                };
+                topLevel.ApplyTemplate();
+                topLevel.LayoutManager.ExecuteInitialLayoutPass();
+
+                var textPresenter = target.FindDescendantOfType<TextPresenter>();
+                Assert.Equal("PART_TextPresenter", textPresenter.Name);
+                var textPresenterMargin = new Thickness(horizontal: 0, vertical: 3);
+                textPresenter.Margin = textPresenterMargin;
+
+                target.InvalidateMeasure();
+                target.Measure(Size.Infinity);
+
+                var scrollViewer = target.FindDescendantOfType<ScrollViewer>();
+                Assert.Equal("PART_ScrollViewer", scrollViewer.Name);
+                Assert.Equal((maxLines * target.LineHeight) + textPresenterMargin.Top + textPresenterMargin.Bottom, scrollViewer.MaxHeight);
+            }
+        }
+
         [Fact]
         public void CanUndo_CanRedo_Is_False_When_Initialized()
         {
@@ -1125,7 +1202,7 @@ namespace Avalonia.Controls.UnitTests
             return new FuncControlTemplate<TextBox>((control, scope) =>
             new ScrollViewer
             {
-                Name = "Part_ScrollViewer",
+                Name = "PART_ScrollViewer",
                 Template = new FuncControlTemplate<ScrollViewer>(ScrollViewerTests.CreateTemplate),
                 Content = new TextPresenter
                 {

From 3dd62bf533289d0ad00d0ae9bb3ab5fb8eb40763 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Fri, 18 Aug 2023 14:57:27 -0400
Subject: [PATCH 61/80] Updated ToggleSplitButton.IsCheckedProperty definition
 to be on a single line.

---
 src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
index e6f0abcad0..c493445ba1 100644
--- a/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/ToggleSplitButton.cs
@@ -37,8 +37,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="IsChecked"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsCheckedProperty =
-            AvaloniaProperty.Register<ToggleSplitButton, bool>(nameof(IsChecked), false,
-                defaultBindingMode: BindingMode.TwoWay);
+            AvaloniaProperty.Register<ToggleSplitButton, bool>(nameof(IsChecked), false, defaultBindingMode: BindingMode.TwoWay);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ToggleSplitButton"/> class.

From 795d13101482c6a5b32e11cf4b3a5c13d4797638 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:23:52 +0200
Subject: [PATCH 62/80] Update DrawingContextImpl.cs

---
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 7b5cca0fde..b1b1de0ffe 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -190,7 +190,7 @@ namespace Avalonia.Skia
 
             var paint = SKPaintCache.Shared.Get();
 
-            paint.Color = new SKColor(255, 255, 255, (byte)(255 * opacity * currentOpacity));
+            paint.Color = new SKColor(255, 255, 255, (byte)(255 * opacity * _currentOpacity));
             paint.FilterQuality = RenderOptions.BitmapInterpolationMode.ToSKFilterQuality();
             paint.BlendMode = RenderOptions.BitmapBlendingMode.ToSKBlendMode();
 
@@ -433,7 +433,7 @@ namespace Avalonia.Skia
             {
                 if (boxShadow != default && boxShadow.IsInset)
                 {
-                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, currentOpacity))
+                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
                     {
                         var spread = (float)boxShadow.Spread;
                         var offsetX = (float)boxShadow.OffsetX;

From 15290a3240c18507c28aa4895234476e7ff0fde0 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 19 Aug 2023 13:31:47 +0100
Subject: [PATCH 63/80] win32: make setting ShowInTaskbar = true on an owned
 window that is already shown, not remove the ownership

This makes us consistent with WPF.
---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 154b20ef84..e9156e553d 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -683,9 +683,10 @@ namespace Avalonia.Win32
             if (parentHwnd == IntPtr.Zero && !_windowProperties.ShowInTaskbar)
             {
                 parentHwnd = OffscreenParentWindow.Handle;
-                _hiddenWindowIsParent = true;
             }
 
+            _hiddenWindowIsParent = parentHwnd == OffscreenParentWindow.Handle;
+
             SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, parentHwnd);
         }
 

From 1f0d189502f3daa00eb47ce003157342154c479a Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 20 Aug 2023 02:20:24 -0700
Subject: [PATCH 64/80] Revert "Clipboard image" (#12599)

---
 .../ControlCatalog/Pages/ClipboardPage.xaml   |  3 -
 .../Pages/ClipboardPage.xaml.cs               | 73 +------------------
 .../Avalonia.Win32/ClipboardFormats.cs        |  7 --
 .../Interop/UnmanagedMethods.cs               | 22 +-----
 4 files changed, 2 insertions(+), 103 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 57b3111ab3..4199a9780f 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -12,9 +12,6 @@
     <Button Click="CopyFilesDataObject" Content="Copy files to clipboard (data object)" />
     <Button Click="PasteFilesDataObject" Content="Paste files from clipboard (data object)" />
 
-    <Button Click="CopyBitmapDataObject" Content="Copy image to clipboard (data object)" ToolTip.Tip="CF_BITMAP, CF_DIB, image/bmp, image/png, image/jpeg" />
-    <Button Click="PasteBitmapDataObject" Content="Paste image from clipboard (data object)" ToolTip.Tip="CF_BITMAP, CF_DIB, image/bmp, image/png, image/jpeg" />
-
     <Button Click="GetFormats" Content="Get clipboard formats" />
     <Button Click="Clear" Content="Clear clipboard" />
 
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index b4c8544a72..089d1af197 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -119,82 +118,12 @@ namespace ControlCatalog.Pages
             }
         }
 
-        private async void CopyBitmapDataObject(object? sender, RoutedEventArgs args)
-        {
-            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
-            {
-                var lines = (ClipboardContent.Text ?? string.Empty)
-                    .Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
-                if (lines.Length < 3)
-                {
-                    return;
-                }
-                var format = lines[0];
-                var hexLine = string.Join(" ", lines.Skip(2));
-                var hexBytes = hexLine.Split(new[] { ' ', '-' }, StringSplitOptions.RemoveEmptyEntries);
-                var bytes = hexBytes.Select(x => Convert.ToByte(x, 16)).ToArray();
-                var dataObject = new DataObject();
-                dataObject.Set(format, bytes);
-                await clipboard.SetDataObjectAsync(dataObject);
-            }
-        }
-
-        private async void PasteBitmapDataObject(object? sender, RoutedEventArgs args)
-        {
-            if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
-            {
-                var format = "Bitmap";
-                var obj = await clipboard.GetDataAsync(format);
-                var bytes = obj as IEnumerable<byte>;
-                if (bytes == null)
-                {
-                    format = "Dib";
-                    obj = await clipboard.GetDataAsync(format);
-                    bytes = obj as IEnumerable<byte>;
-                }
-                if (bytes == null)
-                {
-                    format = "image/bmp";
-                    obj = await clipboard.GetDataAsync(format);
-                    bytes = obj as IEnumerable<byte>;
-                }
-                if (bytes == null)
-                {
-                    format = "image/png";
-                    obj = await clipboard.GetDataAsync(format);
-                    bytes = obj as IEnumerable<byte>;
-                }
-                if (bytes == null)
-                {
-                    format = "image/jpeg";
-                    obj = await clipboard.GetDataAsync(format);
-                    bytes = obj as IEnumerable<byte>;
-                }
-
-                if (bytes != null)
-                {
-                    var printable = bytes.ToArray();
-                    var sb = new StringBuilder(256 + printable.Length * 3);
-                    sb.AppendLine($"{format}");
-                    sb.AppendLine($"{printable.Length} bytes");
-                    sb.Append(BitConverter.ToString(printable).Replace('-', ' '));
-                    ClipboardContent.TextWrapping = Avalonia.Media.TextWrapping.NoWrap;
-                    ClipboardContent.Text = sb.ToString();
-                    ClipboardContent.TextWrapping = Avalonia.Media.TextWrapping.Wrap;
-                }
-                else
-                {
-                    ClipboardContent.Text = string.Empty;
-                }
-            }
-        }
-
         private async void GetFormats(object sender, RoutedEventArgs args)
         {
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
             {
                 var formats = await clipboard.GetFormatsAsync();
-                ClipboardContent.Text = formats != null ? string.Join(Environment.NewLine, formats) : string.Empty;
+                ClipboardContent.Text = string.Join(Environment.NewLine, formats);
             }
         }
 
diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
index 5d5bad5ffd..00fdeb2a1d 100644
--- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs
@@ -33,13 +33,6 @@ namespace Avalonia.Win32
 #pragma warning disable CS0618 // Type or member is obsolete
             new ClipboardFormat(DataFormats.FileNames, (ushort)UnmanagedMethods.ClipboardFormat.CF_HDROP),
 #pragma warning restore CS0618 // Type or member is obsolete
-
-            new ClipboardFormat("Bitmap", (ushort)UnmanagedMethods.ClipboardFormat.CF_BITMAP),
-            new ClipboardFormat("MetafilePict", (ushort)UnmanagedMethods.ClipboardFormat.CF_METAFILEPICT),
-            new ClipboardFormat("Dib", (ushort)UnmanagedMethods.ClipboardFormat.CF_DIB, (ushort)UnmanagedMethods.ClipboardFormat.CF_DIBV5),
-            new ClipboardFormat("EnhancedMetafile", (ushort)UnmanagedMethods.ClipboardFormat.CF_ENHMETAFILE),
-            new ClipboardFormat("Palette", (ushort)UnmanagedMethods.ClipboardFormat.CF_PALETTE),
-            new ClipboardFormat("PenData", (ushort)UnmanagedMethods.ClipboardFormat.CF_PENDATA),
         };
 
 
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index f55d7a5f07..226ed2a406 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -2135,37 +2135,17 @@ namespace Avalonia.Win32.Interop
             /// </summary>
             CF_BITMAP = 2,
             /// <summary>
-            /// Handle to a metafile picture format as defined by the METAFILEPICT structure. When passing a CF_METAFILEPICT handle by means of DDE, the application responsible for deleting hMem should also free the metafile referred to by the CF_METAFILEPICT handle.
-            /// </summary>
-            CF_METAFILEPICT = 3,
-            /// <summary>
             /// A memory object containing a BITMAPINFO structure followed by the bitmap bits.
             /// </summary>
-            CF_DIB = 8,
-            /// <summary>
-            /// Handle to a color palette.
-            /// </summary>
-            CF_PALETTE = 9,
-            /// <summary>
-            /// Data for the pen extensions to the Microsoft Windows for Pen Computing.
-            /// </summary>
-            CF_PENDATA = 10,
+            CF_DIB = 3,
             /// <summary>
             /// Unicode text format. Each line ends with a carriage return/linefeed (CR-LF) combination. A null character signals the end of the data.
             /// </summary>
             CF_UNICODETEXT = 13,
             /// <summary>
-            /// A handle to an enhanced metafile (HENHMETAFILE).
-            /// </summary>
-            CF_ENHMETAFILE = 14,
-            /// <summary>
             /// A handle to type HDROP that identifies a list of files. 
             /// </summary>
             CF_HDROP = 15,
-            /// <summary>
-            /// A memory object containing a BITMAPV5HEADER structure followed by the bitmap color space information and the bitmap bits.
-            /// </summary>
-            CF_DIBV5 = 17,
         }
 
         public struct MSG

From 96da4f06990c2e7c811c20a8a025d7405396403e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 20 Aug 2023 22:11:26 +0600
Subject: [PATCH 65/80] When calculating geometry bounds take into account
 parameters that affect geometry bounds

---
 .../Drawing/Nodes/RenderDataGeometryNode.cs   |   2 +-
 .../SceneGraph/GeometryBoundsHelper.cs        |  31 ----
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  |  27 +---
 src/Skia/Avalonia.Skia/GeometryImpl.cs        | 151 +++++++-----------
 src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs |  20 +++
 .../Avalonia.Direct2D1/Media/GeometryImpl.cs  |  19 ++-
 .../RenderBoundsTests.cs                      |  43 +++++
 7 files changed, 141 insertions(+), 152 deletions(-)
 delete mode 100644 src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
 create mode 100644 tests/Avalonia.Skia.UnitTests/RenderBoundsTests.cs

diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/Nodes/RenderDataGeometryNode.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/Nodes/RenderDataGeometryNode.cs
index 67231c9012..5a40a6b279 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/Nodes/RenderDataGeometryNode.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/Nodes/RenderDataGeometryNode.cs
@@ -25,5 +25,5 @@ class RenderDataGeometryNode : RenderDataBrushAndPenNode
         context.Context.DrawGeometry(ServerBrush, ServerPen, Geometry!);
     }
 
-    public override Rect? Bounds => Geometry?.GetRenderBounds(ServerPen).CalculateBoundsWithLineCaps(ServerPen) ?? default;
+    public override Rect? Bounds => Geometry?.GetRenderBounds(ServerPen) ?? default;
 }
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
deleted file mode 100644
index b1129e81c4..0000000000
--- a/src/Avalonia.Base/Rendering/SceneGraph/GeometryBoundsHelper.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Utilities;
-
-namespace Avalonia.Rendering.SceneGraph;
-
-internal static class GeometryBoundsHelper
-{
-    /// <summary>
-    /// Calculates the bounds of a given geometry with respect to the pens <see cref="IPen.LineCap"/>
-    /// </summary>
-    /// <param name="originalBounds">The calculated bounds without <see cref="IPen.LineCap"/>s</param>
-    /// <param name="pen">The pen with information about the <see cref="IPen.LineCap"/>s</param>
-    /// <returns></returns>
-    public static Rect CalculateBoundsWithLineCaps(this Rect originalBounds, IPen? pen)
-    {
-        if (pen is null || MathUtilities.IsZero(pen.Thickness)) return originalBounds;
-
-        switch (pen.LineCap)
-        {
-            case PenLineCap.Flat:
-                return originalBounds;
-            case PenLineCap.Round:
-                return originalBounds.Inflate(pen.Thickness / 2);
-            case PenLineCap.Square:
-                return originalBounds.Inflate(pen.Thickness);
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index b1b1de0ffe..76d236e18a 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -1247,31 +1247,8 @@ namespace Avalonia.Skia
             // https://docs.microsoft.com/en-us/xamarin/xamarin-forms/user-interface/graphics/skiasharp/paths/dots
             // TODO: Still something is off, dashes are now present, but don't look the same as D2D ones.
 
-            switch (pen.LineCap)
-            {
-                case PenLineCap.Round:
-                    paint.StrokeCap = SKStrokeCap.Round;
-                    break;
-                case PenLineCap.Square:
-                    paint.StrokeCap = SKStrokeCap.Square;
-                    break;
-                default:
-                    paint.StrokeCap = SKStrokeCap.Butt;
-                    break;
-            }
-
-            switch (pen.LineJoin)
-            {
-                case PenLineJoin.Miter:
-                    paint.StrokeJoin = SKStrokeJoin.Miter;
-                    break;
-                case PenLineJoin.Round:
-                    paint.StrokeJoin = SKStrokeJoin.Round;
-                    break;
-                default:
-                    paint.StrokeJoin = SKStrokeJoin.Bevel;
-                    break;
-            }
+            paint.StrokeCap = pen.LineCap.ToSKStrokeCap();
+            paint.StrokeJoin = pen.LineJoin.ToSKStrokeJoin();
 
             paint.StrokeMiter = (float) pen.MiterLimit;
 
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
index aee84d1346..c1ce4a661f 100644
--- a/src/Skia/Avalonia.Skia/GeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs
@@ -43,46 +43,11 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public bool StrokeContains(IPen? pen, Point point)
         {
-            // Skia requires to compute stroke path to check for point containment.
-            // Due to that we are caching using stroke width.
-            // Usually this function is being called with same stroke width per path, so this saves a lot of Skia traffic.
+            _pathCache.UpdateIfNeeded(StrokePath, pen);
 
-            var strokeWidth = (float)(pen?.Thickness ?? 0);
-
-            if (!_pathCache.HasCacheFor(strokeWidth))
-            {
-                UpdatePathCache(strokeWidth);
-            }
-
-            return PathContainsCore(_pathCache.CachedStrokePath, point);
-        }
-
-        /// <summary>
-        /// Update path cache for given stroke width.
-        /// </summary>
-        /// <param name="strokeWidth">Stroke width.</param>
-        private void UpdatePathCache(float strokeWidth)
-        {
-            var strokePath = new SKPath();
-
-            // For stroke widths close to 0 simply use empty path. Render bounds are cached from fill path.
-            if (Math.Abs(strokeWidth) < float.Epsilon)
-            {
-                _pathCache.Cache(strokePath, strokeWidth, Bounds);
-            }
-            else
-            {
-                var paint = SKPaintCache.Shared.Get();
-                paint.IsStroke = true;
-                paint.StrokeWidth = strokeWidth;
-                paint.GetFillPath(StrokePath, strokePath);
-
-                SKPaintCache.Shared.ReturnReset(paint);
-
-                _pathCache.Cache(strokePath, strokeWidth, strokePath.TightBounds.ToAvaloniaRect());
-            }
+            return PathContainsCore(_pathCache.ExpandedPath, point);
         }
-
+        
         /// <summary>
         /// Check Skia path if it contains a point.
         /// </summary>
@@ -106,14 +71,8 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public Rect GetRenderBounds(IPen? pen)
         {
-            var strokeWidth = (float)(pen?.Thickness ?? 0);
-
-            if (!_pathCache.HasCacheFor(strokeWidth))
-            {
-                UpdatePathCache(strokeWidth);
-            }
-
-            return _pathCache.CachedGeometryRenderBounds;
+            _pathCache.UpdateIfNeeded(StrokePath, pen);
+            return _pathCache.RenderBounds;
         }
 
         /// <inheritdoc />
@@ -180,66 +139,70 @@ namespace Avalonia.Skia
         /// </summary>
         protected void InvalidateCaches()
         {
-            _pathCache.Invalidate();
+            _pathCache.Dispose();
+            _pathCache = default;
         }
 
         private struct PathCache
         {
-            private float _cachedStrokeWidth;
-
-            /// <summary>
-            /// Tolerance for two stroke widths to be deemed equal
-            /// </summary>
-            public const float Tolerance = float.Epsilon;
-
-            /// <summary>
-            /// Cached contour path.
-            /// </summary>
-            public SKPath? CachedStrokePath { get; private set; }
-
-            /// <summary>
-            /// Cached geometry render bounds.
-            /// </summary>
-            public Rect CachedGeometryRenderBounds { get; private set; }
-
-            /// <summary>
-            /// Is cached valid for given stroke width.
-            /// </summary>
-            /// <param name="strokeWidth">Stroke width to check.</param>
-            /// <returns>True, if CachedStrokePath can be used for given stroke width.</returns>
-            public bool HasCacheFor(float strokeWidth)
+            private double _width, _miterLimit;
+            private PenLineCap _cap;
+            private PenLineJoin _join;
+            private SKPath? _path, _cachedFor;
+            private Rect? _renderBounds;
+            private static readonly SKPath s_emptyPath = new();
+            
+
+            public Rect RenderBounds => _renderBounds ??= (_path ?? _cachedFor ?? s_emptyPath).Bounds.ToAvaloniaRect();
+            public SKPath ExpandedPath => _path ?? s_emptyPath;
+
+            public void UpdateIfNeeded(SKPath? strokePath, IPen? pen)
             {
-                return CachedStrokePath != null && Math.Abs(_cachedStrokeWidth - strokeWidth) < Tolerance;
-            }
-
-            /// <summary>
-            /// Cache path for given stroke width. Takes ownership of a passed path.
-            /// </summary>
-            /// <param name="path">Path to cache.</param>
-            /// <param name="strokeWidth">Stroke width to cache.</param>
-            /// <param name="geometryRenderBounds">Render bounds to use.</param>
-            public void Cache(SKPath path, float strokeWidth, Rect geometryRenderBounds)
-            {
-                if (CachedStrokePath != path)
+                var strokeWidth = pen?.Thickness ?? 0;
+                var miterLimit = pen?.MiterLimit ?? 0;
+                var cap = pen?.LineCap ?? default;
+                var join = pen?.LineJoin ?? default;
+                
+                if (_cachedFor == strokePath
+                    && _path != null
+                    && cap == _cap
+                    && join == _join
+                    && Math.Abs(_width - strokeWidth) < float.Epsilon
+                    && (join != PenLineJoin.Miter || Math.Abs(_miterLimit - miterLimit) > float.Epsilon))
+                    // We are up to date
+                    return;
+
+                _renderBounds = null;
+                _cachedFor = strokePath;
+                _width = strokeWidth;
+                _cap = cap;
+                _join = join;
+                _miterLimit = miterLimit;
+                
+                if (strokePath == null || Math.Abs(strokeWidth) < float.Epsilon)
                 {
-                    CachedStrokePath?.Dispose();
+                    _path = null;
+                    return;
                 }
 
-                CachedStrokePath = path;
-                CachedGeometryRenderBounds = geometryRenderBounds;
-                _cachedStrokeWidth = strokeWidth;
+                var paint = SKPaintCache.Shared.Get();
+                paint.IsStroke = true;
+                paint.StrokeWidth = (float)_width;
+                paint.StrokeCap = cap.ToSKStrokeCap();
+                paint.StrokeJoin = join.ToSKStrokeJoin();
+                paint.StrokeMiter = (float)miterLimit;
+                _path = new SKPath();
+                paint.GetFillPath(strokePath, _path);
+
+                SKPaintCache.Shared.ReturnReset(paint);
             }
 
-            /// <summary>
-            /// Invalidate cache state.
-            /// </summary>
-            public void Invalidate()
+            public void Dispose()
             {
-                CachedStrokePath?.Dispose();
-                CachedStrokePath = null;
-                CachedGeometryRenderBounds = default;
-                _cachedStrokeWidth = default;
+                _path?.Dispose();
+                _path = null;
             }
+
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
index 455e415ce1..44fe7aed89 100644
--- a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -196,6 +196,26 @@ namespace Avalonia.Skia
             }
         }
 
+        public static SKStrokeCap ToSKStrokeCap(this PenLineCap cap)
+        {
+            return cap switch
+            {
+                PenLineCap.Round => SKStrokeCap.Round,
+                PenLineCap.Square => SKStrokeCap.Square,
+                _ => SKStrokeCap.Butt
+            };
+        }
+
+        public static SKStrokeJoin ToSKStrokeJoin(this PenLineJoin join)
+        {
+            return join switch
+            {
+                PenLineJoin.Bevel => SKStrokeJoin.Bevel,
+                PenLineJoin.Round => SKStrokeJoin.Round,
+                _ => SKStrokeJoin.Miter
+            };
+        }
+
         public static TextAlignment ToAvalonia(this SKTextAlign a)
         {
             switch (a)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 9a93d1afd3..e1c08e0814 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,6 +1,10 @@
+using System;
 using Avalonia.Logging;
+using Avalonia.Media;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
+using Geometry = SharpDX.Direct2D1.Geometry;
+using PathGeometry = SharpDX.Direct2D1.PathGeometry;
 
 namespace Avalonia.Direct2D1.Media
 {
@@ -27,7 +31,20 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc/>
         public Rect GetRenderBounds(Avalonia.Media.IPen pen)
         {
-            return Geometry.GetWidenedBounds((float)(pen?.Thickness ?? 0)).ToAvalonia();
+            if (pen == null || Math.Abs(pen.Thickness) < float.Epsilon)
+                return Geometry.GetBounds().ToAvalonia();
+            var originalBounds = Geometry.GetWidenedBounds((float)pen.Thickness).ToAvalonia();
+            switch (pen.LineCap)
+            {
+                case PenLineCap.Flat:
+                    return originalBounds;
+                case PenLineCap.Round:
+                    return originalBounds.Inflate(pen.Thickness / 2);
+                case PenLineCap.Square:
+                    return originalBounds.Inflate(pen.Thickness);
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
 
         /// <inheritdoc/>
diff --git a/tests/Avalonia.Skia.UnitTests/RenderBoundsTests.cs b/tests/Avalonia.Skia.UnitTests/RenderBoundsTests.cs
new file mode 100644
index 0000000000..a659c2b8b2
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/RenderBoundsTests.cs
@@ -0,0 +1,43 @@
+using System;
+using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests
+{
+    public class RenderBoundsTests
+    {
+        [Theory,
+            InlineData("M10 20 L 20 10 L 30 20", PenLineCap.Round, PenLineJoin.Miter, 2, 10, 
+                8.585786819458008, 8.585786819458008, 22.828428268432617, 12.828428268432617),
+            InlineData("M10 10 L 20 10", PenLineCap.Round, PenLineJoin.Miter,2, 10,
+                9,9,12,2),
+            InlineData("M10 10 L 20 15 L 10 20", PenLineCap.Flat, PenLineJoin.Miter, 2, 20,
+                9.552786827087402, 9.105572700500488, 12.683281898498535, 11.788853645324707)
+        
+        ]
+        public void RenderBoundsAreCorrectlyCalculated(string path, PenLineCap cap, PenLineJoin join, double thickness, double miterLimit, double x, double y, double width, double height)
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                       .With(renderInterface: new PlatformRenderInterface())))
+            {
+                var geo = PathGeometry.Parse(path);
+                var pen = new Pen(Brushes.Black, thickness, null, cap, join, miterLimit);
+                var bounds = geo.GetRenderBounds(pen);
+                var tolerance = 0.001;
+                if (
+                    Math.Abs(bounds.X - x) > tolerance
+                    || Math.Abs(bounds.Y - y) > tolerance
+                    || Math.Abs(bounds.Width - width) > tolerance
+                    || Math.Abs(bounds.Height - height) > tolerance)
+                    Assert.Fail($"Expected {x}:{y}:{width}:{height}, got {bounds}");
+                
+                Assert.Equal(new Rect(x, y, width, height), bounds);
+            }
+        }
+    }
+}

From b0691681cb7334974a0e2c0dfa9f87571eeb57ec Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:19:18 +0200
Subject: [PATCH 66/80] Allow setting a LineHeight that is smaller than the
 default

---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index a2936f1857..2095ded67f 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1282,10 +1282,7 @@ namespace Avalonia.Media.TextFormatting
 
             if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
             {
-                if (lineHeight > height)
-                {
-                    height = lineHeight;
-                }
+                height = lineHeight;
             }
 
             return new TextLineMetrics

From f3625f0ee1de720c16abaf56a84c24119283ece0 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 21 Aug 2023 11:17:07 +0200
Subject: [PATCH 67/80] Fix TextTrimming in combination with TextWrapping

---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index a2936f1857..4432b525ea 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1278,7 +1278,7 @@ namespace Avalonia.Media.TextFormatting
             var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
             var overhangLeading = Math.Max(0, bounds.Left - start);
             var overhangTrailing = Math.Max(0, bounds.Width - widthIncludingWhitespace);
-            var hasOverflowed = overhangLeading + widthIncludingWhitespace + overhangTrailing > _paragraphWidth;
+            var hasOverflowed = width > _paragraphWidth;
 
             if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
             {

From 16ab9c595ce2f8e441f0cea582b7ab61b21abb55 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Mon, 21 Aug 2023 22:14:40 -0400
Subject: [PATCH 68/80] Fix for TextBlock.TextDecorations not inheriting down
 to inlines.

---
 src/Avalonia.Controls/Documents/Inline.cs     | 27 ++++++++++++++++---
 src/Avalonia.Controls/TextBlock.cs            |  2 +-
 .../TextBlockTests.cs                         | 21 +++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Documents/Inline.cs b/src/Avalonia.Controls/Documents/Inline.cs
index 23b806583e..a6fe57e66e 100644
--- a/src/Avalonia.Controls/Documents/Inline.cs
+++ b/src/Avalonia.Controls/Documents/Inline.cs
@@ -13,9 +13,10 @@ namespace Avalonia.Controls.Documents
         /// <summary>
         /// AvaloniaProperty for <see cref="TextDecorations" /> property.
         /// </summary>
-        public static readonly StyledProperty<TextDecorationCollection?> TextDecorationsProperty =
-            AvaloniaProperty.Register<Inline, TextDecorationCollection?>(
-                nameof(TextDecorations));
+        public static readonly AttachedProperty<TextDecorationCollection?> TextDecorationsProperty =
+            AvaloniaProperty.RegisterAttached<Inline, Inline, TextDecorationCollection?>(
+                nameof(TextDecorations),
+                inherits: true);
 
         /// <summary>
         /// AvaloniaProperty for <see cref="BaselineAlignment" /> property.
@@ -43,7 +44,27 @@ namespace Avalonia.Controls.Documents
             get { return GetValue(BaselineAlignmentProperty); }
             set { SetValue(BaselineAlignmentProperty, value); }
         }
+        
+        /// <summary>
+        /// Gets the value of the attached <see cref="TextDecorationsProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <returns>The font style.</returns>
+        public static TextDecorationCollection? GetTextDecorations(Control control)
+        {
+            return control.GetValue(TextDecorationsProperty);
+        }
 
+        /// <summary>
+        /// Sets the value of the attached <see cref="TextDecorationsProperty"/> on a control.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="value">The property value to set.</param>
+        public static void SetTextDecorations(Control control, TextDecorationCollection? value)
+        {
+            control.SetValue(TextDecorationsProperty, value);
+        }
+        
         internal abstract void BuildTextRun(IList<TextRun> textRuns);
 
         internal abstract void AppendText(StringBuilder stringBuilder);
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index ea420c7c45..cc92bdd752 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -135,7 +135,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="TextDecorations"/> property.
         /// </summary>
         public static readonly StyledProperty<TextDecorationCollection?> TextDecorationsProperty =
-            AvaloniaProperty.Register<TextBlock, TextDecorationCollection?>(nameof(TextDecorations));
+            Inline.TextDecorationsProperty.AddOwner<TextBlock>();
 
         /// <summary>
         /// Defines the <see cref="Inlines"/> property.
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index eb1d6f5ea4..fd3d80729a 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -202,5 +202,26 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(0, target.Inlines.Count);
             }
         }
+        
+        [Fact]
+        public void Setting_TextDecorations_Should_Update_Inlines()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TextBlock();
+
+                target.Inlines.Add(new Run("Hello World"));
+
+                Assert.Equal(1, target.Inlines.Count);
+
+                Assert.Null(target.Inlines[0].TextDecorations);
+
+                var underline = TextDecorations.Underline;
+
+                target.TextDecorations = underline;
+
+                Assert.Equal(underline, target.Inlines[0].TextDecorations);
+            }
+        }
     }
 }

From b024bb463b9f729b3bc176e9917cd14acbb6d46d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:41:30 +0200
Subject: [PATCH 69/80] Add tests for #12620.

One failing.
---
 .../ItemsControlTests.cs                      | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 58e4ec1b75..0a8ea7c7b2 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -14,6 +14,7 @@ using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml.Templates;
+using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
@@ -128,6 +129,102 @@ namespace Avalonia.Controls.UnitTests
             Assert.Same(container.Theme, theme);
         }
 
+        [Fact]
+        public void ItemContainerTheme_Can_Be_Changed()
+        {
+            using var app = Start();
+            
+            var theme1 = new ControlTheme 
+            { 
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Red) }
+            };
+
+            var theme2 = new ControlTheme
+            {
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Green) }
+            };
+
+            var target = CreateTarget(
+                itemsSource: new[] { "Foo" },
+                itemContainerTheme: theme1);
+
+            var container = GetContainer(target);
+
+            Assert.Same(container.Theme, theme1);
+            Assert.Equal(container.Background, Brushes.Red);
+
+            target.ItemContainerTheme = theme2;
+
+            container = GetContainer(target);
+            Assert.Same(container.Theme, theme2);
+            Assert.Equal(container.Background, Brushes.Green);
+        }
+
+        [Fact]
+        public void ItemContainerTheme_Can_Be_Changed_Virtualizing()
+        {
+            using var app = Start();
+
+            var theme1 = new ControlTheme
+            {
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Red) }
+            };
+
+            var theme2 = new ControlTheme
+            {
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Green) }
+            };
+
+            var itemsPanel = new FuncTemplate<Panel?>(() => new VirtualizingStackPanel());
+            var target = CreateTarget(
+                itemsSource: new[] { "Foo" },
+                itemContainerTheme: theme1,
+                itemsPanel: itemsPanel);
+
+            var container = GetContainer(target);
+
+            Assert.Same(container.Theme, theme1);
+            Assert.Equal(container.Background, Brushes.Red);
+
+            target.ItemContainerTheme = theme2;
+            Layout(target);
+
+            container = GetContainer(target);
+            Assert.Same(container.Theme, theme2);
+            Assert.Equal(container.Background, Brushes.Green);
+        }
+
+        [Fact]
+        public void ItemContainerTheme_Can_Be_Cleared()
+        {
+            using var app = Start();
+
+            var theme = new ControlTheme
+            {
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Red) }
+            };
+
+            var target = CreateTarget(
+                itemsSource: new[] { "Foo" },
+                itemContainerTheme: theme);
+
+            var container = GetContainer(target);
+
+            Assert.Same(container.Theme, theme);
+            Assert.Equal(container.Background, Brushes.Red);
+
+            target.ItemContainerTheme = null;
+
+            container = GetContainer(target);
+            Assert.Null(container.Theme);
+            Assert.Null(container.Background);
+        }
+
         [Fact]
         public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
@@ -851,6 +948,7 @@ namespace Avalonia.Controls.UnitTests
             IList? itemsSource = null,
             ControlTheme? itemContainerTheme = null,
             IDataTemplate? itemTemplate = null,
+            ITemplate<Panel?>? itemsPanel = null,
             IEnumerable<IDataTemplate>? dataTemplates = null,
             bool performLayout = true)
         {
@@ -861,6 +959,7 @@ namespace Avalonia.Controls.UnitTests
                 itemsSource: itemsSource,
                 itemContainerTheme: itemContainerTheme,
                 itemTemplate: itemTemplate,
+                itemsPanel: itemsPanel,
                 dataTemplates: dataTemplates,
                 performLayout: performLayout);
         }

From 754bdd4220e91cae5c76466cc98d88c41c761075 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:44:00 +0200
Subject: [PATCH 70/80] Handle changing ItemContainerTheme properly.

Previously only handled the case where the `ItemContainerTheme` was changing from null -> non-null.

Fixes #12620
---
 src/Avalonia.Controls/ItemsControl.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 83aa88a7b6..47b943ed2e 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -665,12 +665,10 @@ namespace Avalonia.Controls
         {
             var itemContainerTheme = ItemContainerTheme;
 
-            if (itemContainerTheme is not null &&
-                !container.IsSet(ThemeProperty) &&
-                StyledElement.GetStyleKey(container) == itemContainerTheme.TargetType)
-            {
+            if (itemContainerTheme is null)
+                container.Theme = null;
+            else if (GetStyleKey(container) == itemContainerTheme.TargetType)
                 container.Theme = itemContainerTheme;
-            }
 
             if (item is not Control)
                 container.DataContext = item;

From f347eaf7112b0672eb3123fa9b36293be84fdb60 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:05:00 +0200
Subject: [PATCH 71/80] Accept base TargetType in ItemContainerTheme

---
 src/Avalonia.Controls/ItemsControl.cs              |  2 +-
 .../ItemsControlTests.cs                           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 47b943ed2e..e8bd3b91a3 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -667,7 +667,7 @@ namespace Avalonia.Controls
 
             if (itemContainerTheme is null)
                 container.Theme = null;
-            else if (GetStyleKey(container) == itemContainerTheme.TargetType)
+            else if (itemContainerTheme.TargetType?.IsAssignableFrom(GetStyleKey(container)) == true)
                 container.Theme = itemContainerTheme;
 
             if (item is not Control)
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 0a8ea7c7b2..a0feabec61 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -129,6 +129,20 @@ namespace Avalonia.Controls.UnitTests
             Assert.Same(container.Theme, theme);
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme_With_Base_TargetType()
+        {
+            using var app = Start();
+            var theme = new ControlTheme { TargetType = typeof(Control) };
+            var target = CreateTarget(
+                itemsSource: new[] { "Foo" },
+                itemContainerTheme: theme);
+
+            var container = GetContainer(target);
+
+            Assert.Same(container.Theme, theme);
+        }
+
         [Fact]
         public void ItemContainerTheme_Can_Be_Changed()
         {

From 03ff228a6d3ba5f3b0ab7678332de52ca22b389f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:46:54 +0200
Subject: [PATCH 72/80] Preserve container themes set locally.

---
 src/Avalonia.Controls/ItemsControl.cs         | 28 ++++++++++---
 .../ItemsControlTests.cs                      | 39 +++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index e8bd3b91a3..b7785162ec 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -67,6 +67,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IBinding?> DisplayMemberBindingProperty =
             AvaloniaProperty.Register<ItemsControl, IBinding?>(nameof(DisplayMemberBinding));
 
+        private static readonly AttachedProperty<ControlTheme?> AppliedItemContainerTheme =
+            AvaloniaProperty.RegisterAttached<ItemsControl, Control, ControlTheme?>("HasAppliedItemContainerTheme");
+
         /// <summary>
         /// Gets or sets the <see cref="IBinding"/> to use for binding to the display member of each item.
         /// </summary>
@@ -663,12 +666,27 @@ namespace Avalonia.Controls
 
         internal void PrepareItemContainer(Control container, object? item, int index)
         {
-            var itemContainerTheme = ItemContainerTheme;
+            // If the container has no theme set, or we've already applied our ItemContainerTheme
+            // (and it hasn't changed since) then we're in control of the container's Theme and may
+            // need to update it.
+            if (!container.IsSet(ThemeProperty) || container.GetValue(AppliedItemContainerTheme) == container.Theme)
+            {
+                var itemContainerTheme = ItemContainerTheme;
 
-            if (itemContainerTheme is null)
-                container.Theme = null;
-            else if (itemContainerTheme.TargetType?.IsAssignableFrom(GetStyleKey(container)) == true)
-                container.Theme = itemContainerTheme;
+                if (itemContainerTheme?.TargetType?.IsAssignableFrom(GetStyleKey(container)) == true)
+                {
+                    // We have an ItemContainerTheme and it matches the container. Set the Theme
+                    // property, and mark the container as having had ItemContainerTheme applied.
+                    container.SetCurrentValue(ThemeProperty, itemContainerTheme);
+                    container.SetValue(AppliedItemContainerTheme, itemContainerTheme);
+                }
+                else
+                {
+                    // Otherwise clear the theme and the HasAppliedItemContainerTheme property.
+                    container.ClearValue(ThemeProperty);
+                    container.ClearValue(AppliedItemContainerTheme);
+                }
+            }
 
             if (item is not Control)
                 container.DataContext = item;
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index a0feabec61..7d3c1fe4f4 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -239,6 +239,45 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(container.Background);
         }
 
+        [Fact]
+        public void ItemContainerTheme_Should_Not_Override_LocalValue_Theme()
+        {
+            using var app = Start();
+
+            var theme1 = new ControlTheme
+            {
+                TargetType = typeof(ContentPresenter),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Red) }
+            };
+
+            var theme2 = new ControlTheme
+            {
+                TargetType = typeof(Control),
+                Setters = { new Setter(ContentPresenter.BackgroundProperty, Brushes.Green) }
+            };
+
+            var items = new object[]
+            {
+                new ContentPresenter(),
+                new ContentPresenter
+                {
+                    Theme = theme2
+                },
+            };
+
+            var target = CreateTarget(
+                itemsSource: items,
+                itemContainerTheme: theme1);
+
+            Assert.Same(theme1, GetContainer(target, 0).Theme);
+            Assert.Same(theme2, GetContainer(target, 1).Theme);
+
+            target.ItemContainerTheme = null;
+
+            Assert.Null(GetContainer(target, 0).Theme);
+            Assert.Same(theme2, GetContainer(target, 1).Theme);
+        }
+
         [Fact]
         public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {

From a48e4e7cdcaf8100a0b5692fc2d64066b1203e4c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:51:25 +0200
Subject: [PATCH 73/80] Fix comment.

---
 src/Avalonia.Controls/ItemsControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index b7785162ec..8c40cc8335 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -682,7 +682,7 @@ namespace Avalonia.Controls
                 }
                 else
                 {
-                    // Otherwise clear the theme and the HasAppliedItemContainerTheme property.
+                    // Otherwise clear the theme and the AppliedItemContainerTheme property.
                     container.ClearValue(ThemeProperty);
                     container.ClearValue(AppliedItemContainerTheme);
                 }

From f8ea38c90e78f3607adbd88cbffc1322efc57faa Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:55:59 +0200
Subject: [PATCH 74/80] Fix property name.

---
 src/Avalonia.Controls/ItemsControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 8c40cc8335..41e9e7c111 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<ItemsControl, IBinding?>(nameof(DisplayMemberBinding));
 
         private static readonly AttachedProperty<ControlTheme?> AppliedItemContainerTheme =
-            AvaloniaProperty.RegisterAttached<ItemsControl, Control, ControlTheme?>("HasAppliedItemContainerTheme");
+            AvaloniaProperty.RegisterAttached<ItemsControl, Control, ControlTheme?>("AppliedItemContainerTheme");
 
         /// <summary>
         /// Gets or sets the <see cref="IBinding"/> to use for binding to the display member of each item.

From 28cfe178b0ae5a9fb6f90d724a7a7f82cf1b2aa4 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Tue, 22 Aug 2023 12:23:42 -0400
Subject: [PATCH 75/80] Fix for AccessText underlines being very blurry since
 they didn't align to pixels.

---
 src/Avalonia.Controls/Primitives/AccessText.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/AccessText.cs b/src/Avalonia.Controls/Primitives/AccessText.cs
index 2e570e25c7..7f939f2d3a 100644
--- a/src/Avalonia.Controls/Primitives/AccessText.cs
+++ b/src/Avalonia.Controls/Primitives/AccessText.cs
@@ -3,6 +3,7 @@ using Avalonia.Input;
 using Avalonia.Reactive;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
+using System;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -68,11 +69,15 @@ namespace Avalonia.Controls.Primitives
             if (underscore != -1 && ShowAccessKey)
             {
                 var rect = TextLayout!.HitTestTextPosition(underscore);
-                var offset = new Vector(0, -1.5);
+
+                var x1 = Math.Round(rect.Left, MidpointRounding.AwayFromZero);
+                var x2 = Math.Round(rect.Right, MidpointRounding.AwayFromZero);
+                var y = Math.Round(rect.Bottom, MidpointRounding.AwayFromZero) - 1.5;
+
                 context.DrawLine(
                     new Pen(Foreground, 1),
-                    rect.BottomLeft + offset,
-                    rect.BottomRight + offset);
+                    new Point(x1, y),
+                    new Point(x2, y));
             }
         }
 

From 495e2bb97385f0c18d396e62b745919b0c561ca9 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 23 Aug 2023 00:23:37 +0200
Subject: [PATCH 76/80] Revert Inline breaking change

---
 src/Avalonia.Controls/Documents/Inline.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Documents/Inline.cs b/src/Avalonia.Controls/Documents/Inline.cs
index a6fe57e66e..7de3ce9d98 100644
--- a/src/Avalonia.Controls/Documents/Inline.cs
+++ b/src/Avalonia.Controls/Documents/Inline.cs
@@ -10,10 +10,11 @@ namespace Avalonia.Controls.Documents
     /// </summary>
     public abstract class Inline : TextElement
     {
+        // TODO12: change the field type to an AttachedProperty for consistency (breaking change)
         /// <summary>
         /// AvaloniaProperty for <see cref="TextDecorations" /> property.
         /// </summary>
-        public static readonly AttachedProperty<TextDecorationCollection?> TextDecorationsProperty =
+        public static readonly StyledProperty<TextDecorationCollection?> TextDecorationsProperty =
             AvaloniaProperty.RegisterAttached<Inline, Inline, TextDecorationCollection?>(
                 nameof(TextDecorations),
                 inherits: true);

From 10c92fe4a8a344553c9bcb239ffa3ffaf2a6c629 Mon Sep 17 00:00:00 2001
From: zhangxi <526684540@qq.com>
Date: Thu, 24 Aug 2023 14:24:15 +0800
Subject: [PATCH 77/80] fix polygon/polyline load fail points within the
 template

---
 src/Avalonia.Controls/Shapes/Polygon.cs  | 7 +------
 src/Avalonia.Controls/Shapes/Polyline.cs | 9 ++-------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Controls/Shapes/Polygon.cs b/src/Avalonia.Controls/Shapes/Polygon.cs
index 78def84448..2d56ced31d 100644
--- a/src/Avalonia.Controls/Shapes/Polygon.cs
+++ b/src/Avalonia.Controls/Shapes/Polygon.cs
@@ -6,18 +6,13 @@ namespace Avalonia.Controls.Shapes
     public class Polygon : Shape
     {
         public static readonly StyledProperty<IList<Point>> PointsProperty =
-            AvaloniaProperty.Register<Polygon, IList<Point>>("Points");
+            AvaloniaProperty.Register<Polygon, IList<Point>>("Points", new Points());
 
         static Polygon()
         {
             AffectsGeometry<Polygon>(PointsProperty);
         }
 
-        public Polygon()
-        {
-            Points = new Points();
-        }
-        
         public IList<Point> Points
         {
             get => GetValue(PointsProperty);
diff --git a/src/Avalonia.Controls/Shapes/Polyline.cs b/src/Avalonia.Controls/Shapes/Polyline.cs
index 2533794f89..63c37780c5 100644
--- a/src/Avalonia.Controls/Shapes/Polyline.cs
+++ b/src/Avalonia.Controls/Shapes/Polyline.cs
@@ -3,10 +3,10 @@ using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
 {
-    public class Polyline: Shape
+    public class Polyline : Shape
     {
         public static readonly StyledProperty<IList<Point>> PointsProperty =
-            AvaloniaProperty.Register<Polyline, IList<Point>>("Points");
+            AvaloniaProperty.Register<Polyline, IList<Point>>("Points", new Points());
 
         static Polyline()
         {
@@ -14,11 +14,6 @@ namespace Avalonia.Controls.Shapes
             AffectsGeometry<Polyline>(PointsProperty);
         }
 
-        public Polyline()
-        {
-            Points = new Points();
-        }
-
         public IList<Point> Points
         {
             get => GetValue(PointsProperty);

From d07e59bc5e8328b2edaad7f91f617c0a1ad224af Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 24 Aug 2023 01:36:03 -0700
Subject: [PATCH 78/80] Implement CVDisplayLink based timer on macOS

---
 .../project.pbxproj                           |  4 +
 .../src/OSX/PlatformRenderTimer.mm            | 84 +++++++++++++++++++
 native/Avalonia.Native/src/OSX/common.h       |  1 +
 native/Avalonia.Native/src/OSX/main.mm        | 11 +++
 src/Avalonia.Native/AvaloniaNativePlatform.cs |  2 +-
 .../AvaloniaNativeRenderTimer.cs              | 58 +++++++++++++
 src/Avalonia.Native/avn.idl                   | 10 +++
 7 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 native/Avalonia.Native/src/OSX/PlatformRenderTimer.mm
 create mode 100644 src/Avalonia.Native/AvaloniaNativeRenderTimer.cs

diff --git a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
index f11b027173..a07532412d 100644
--- a/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
@@ -59,6 +59,7 @@
 		BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */ = {isa = PBXBuildFile; fileRef = BC11A5BC2608D58F0017BAD0 /* automation.h */; };
 		BC11A5BF2608D58F0017BAD0 /* automation.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC11A5BD2608D58F0017BAD0 /* automation.mm */; };
 		ED3791C42862E1F40080BD62 /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */; };
+		ED754D262A97306B0078B4DF /* PlatformRenderTimer.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED754D252A97306B0078B4DF /* PlatformRenderTimer.mm */; };
 		EDF8CDCD2964CB01001EE34F /* PlatformSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = EDF8CDCC2964CB01001EE34F /* PlatformSettings.mm */; };
 /* End PBXBuildFile section */
 
@@ -122,6 +123,7 @@
 		BC11A5BC2608D58F0017BAD0 /* automation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = automation.h; sourceTree = "<group>"; };
 		BC11A5BD2608D58F0017BAD0 /* automation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = automation.mm; sourceTree = "<group>"; };
 		ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
+		ED754D252A97306B0078B4DF /* PlatformRenderTimer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformRenderTimer.mm; sourceTree = "<group>"; };
 		EDF8CDCC2964CB01001EE34F /* PlatformSettings.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformSettings.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -162,6 +164,7 @@
 		AB7A61E62147C814003C5833 = {
 			isa = PBXGroup;
 			children = (
+				ED754D252A97306B0078B4DF /* PlatformRenderTimer.mm */,
 				855EDC9E28C6546F00807998 /* PlatformBehaviorInhibition.mm */,
 				8D2F3511292F6AAE007FCF54 /* AvnTextInputMethodDelegate.h */,
 				8D300D68292E1E5D00320C49 /* AvnTextInputMethod.mm */,
@@ -333,6 +336,7 @@
 				18391068E48EF96E3DB5FDAB /* ResizeScope.mm in Sources */,
 				18391D4EB311BC7EF8B8C0A6 /* AvnView.mm in Sources */,
 				18391AA7E0BBA74D184C5734 /* AutoFitContentView.mm in Sources */,
+				ED754D262A97306B0078B4DF /* PlatformRenderTimer.mm in Sources */,
 				1839151F32D1BB1AB51A7BB6 /* AvnPanelWindow.mm in Sources */,
 				18391AC16726CBC45856233B /* AvnWindow.mm in Sources */,
 				18391D8CD1756DC858DC1A09 /* PopupImpl.mm in Sources */,
diff --git a/native/Avalonia.Native/src/OSX/PlatformRenderTimer.mm b/native/Avalonia.Native/src/OSX/PlatformRenderTimer.mm
new file mode 100644
index 0000000000..f372cc9047
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/PlatformRenderTimer.mm
@@ -0,0 +1,84 @@
+#include "common.h"
+
+class PlatformRenderTimer : public ComSingleObject<IAvnPlatformRenderTimer, &IID_IAvnPlatformRenderTimer>
+{
+private:
+    ComPtr<IAvnActionCallback> _callback;
+    CVDisplayLinkRef _displayLink;
+
+public:
+    FORWARD_IUNKNOWN()
+    virtual HRESULT RegisterTick (
+        IAvnActionCallback* callback) override
+    {
+        START_COM_CALL;
+        
+        @autoreleasepool
+        {
+            if (_displayLink != nil)
+            {
+                return E_UNEXPECTED;
+            }
+
+            _callback = callback;
+            auto result = CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink);
+            if (result != 0)
+            {
+                return E_FAIL;
+            }
+
+            result = CVDisplayLinkSetOutputCallback(_displayLink, OnTick, this);
+            if (result != 0)
+            {
+                return E_FAIL;
+            }
+        }
+        return S_OK;
+    }
+
+    virtual void Start () override
+    {
+        START_COM_CALL;
+
+        @autoreleasepool
+        {
+            if (CVDisplayLinkIsRunning(_displayLink) == false) {
+                CVDisplayLinkStart(_displayLink);
+            }
+        }
+    }
+
+    virtual void Stop () override
+    {
+        START_COM_CALL;
+
+        @autoreleasepool
+        {
+            if (CVDisplayLinkIsRunning(_displayLink) == true) {
+                CVDisplayLinkStop(_displayLink);
+            }
+        }
+    }
+
+    virtual bool RunsInBackground () override
+    {
+        START_COM_CALL;
+
+        @autoreleasepool
+        {
+            return true;
+        }
+    }
+    
+    static CVReturn OnTick(CVDisplayLinkRef displayLink, const CVTimeStamp *inNow, const CVTimeStamp *inOutputTime, CVOptionFlags flagsIn, CVOptionFlags *flagsOut, void *displayLinkContext)
+    {
+        PlatformRenderTimer *object = (PlatformRenderTimer *)displayLinkContext;
+        object->_callback->Run();
+        return kCVReturnSuccess;
+    }
+};
+
+extern IAvnPlatformRenderTimer* CreatePlatformRenderTimer()
+{
+    return new PlatformRenderTimer();
+}
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 672525c64a..44441ee15d 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -32,6 +32,7 @@ extern IAvnApplicationCommands* CreateApplicationCommands();
 extern IAvnPlatformBehaviorInhibition* CreatePlatformBehaviorInhibition();
 extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent);
 extern IAvnPlatformSettings* CreatePlatformSettings();
+extern IAvnPlatformRenderTimer* CreatePlatformRenderTimer();
 extern void SetAppMenu(IAvnMenu *menu);
 extern void SetServicesMenu (IAvnMenu* menu);
 extern IAvnMenu* GetAppMenu ();
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 3fddb72529..41d6fd37ab 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -446,6 +446,17 @@ public:
             return S_OK;
         }
     }
+    
+    virtual HRESULT CreatePlatformRenderTimer(IAvnPlatformRenderTimer** ppv) override
+    {
+        START_COM_CALL;
+        
+        @autoreleasepool
+        {
+            *ppv = ::CreatePlatformRenderTimer();
+            return S_OK;
+        }
+    }
 };
 
 extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative()
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index b7c58cded9..f24c6fa96f 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -108,7 +108,7 @@ namespace Avalonia.Native
                 .Bind<IPlatformSettings>().ToConstant(new NativePlatformSettings(_factory.CreatePlatformSettings()))
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl(_factory.CreateClipboard()))
-                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
+                .Bind<IRenderTimer>().ToConstant(new AvaloniaNativeRenderTimer(_factory.CreatePlatformRenderTimer()))
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider())
                 .Bind<IPlatformDragSource>().ToConstant(new AvaloniaNativeDragSource(_factory))
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(applicationPlatform)
diff --git a/src/Avalonia.Native/AvaloniaNativeRenderTimer.cs b/src/Avalonia.Native/AvaloniaNativeRenderTimer.cs
new file mode 100644
index 0000000000..9021fdf345
--- /dev/null
+++ b/src/Avalonia.Native/AvaloniaNativeRenderTimer.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Diagnostics;
+using Avalonia.Native.Interop;
+using Avalonia.Rendering;
+#nullable enable
+
+namespace Avalonia.Native;
+
+internal sealed class AvaloniaNativeRenderTimer : NativeCallbackBase, IRenderTimer, IAvnActionCallback
+{
+    private readonly IAvnPlatformRenderTimer _platformRenderTimer;
+    private readonly Stopwatch _stopwatch;
+    private Action<TimeSpan>? _tick;
+    private int _subscriberCount;
+    private bool registered;
+
+    public AvaloniaNativeRenderTimer(IAvnPlatformRenderTimer platformRenderTimer)
+    {
+        _platformRenderTimer = platformRenderTimer;
+        _stopwatch = Stopwatch.StartNew();
+    }
+
+    public event Action<TimeSpan> Tick
+    {
+        add
+        {
+            _tick += value;
+
+            if (!registered)
+            {
+                registered = true;
+                _platformRenderTimer.RegisterTick(this);
+            }
+
+            if (_subscriberCount++ == 0)
+            {
+                _platformRenderTimer.Start();
+            }
+        }
+
+        remove
+        {
+            if (--_subscriberCount == 0)
+            {
+                _platformRenderTimer.Stop();
+            }
+
+            _tick -= value;
+        }
+    }
+
+    public bool RunsInBackground => _platformRenderTimer.RunsInBackground().FromComBool();
+
+    public void Run()
+    {
+        _tick?.Invoke(_stopwatch.Elapsed);
+    }
+}
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 0911e5ffff..7eac1d33a8 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -507,6 +507,7 @@ interface IAvaloniaNativeFactory : IUnknown
      HRESULT CreateApplicationCommands(IAvnApplicationCommands** ppv);
      HRESULT CreatePlatformSettings(IAvnPlatformSettings** ppv);
      HRESULT CreatePlatformBehaviorInhibition(IAvnPlatformBehaviorInhibition** ppv);
+     HRESULT CreatePlatformRenderTimer(IAvnPlatformRenderTimer** ppv);
 }
 
 [uuid(233e094f-9b9f-44a3-9a6e-6948bbdd9fb1)]
@@ -999,3 +1000,12 @@ interface IAvnPlatformBehaviorInhibition : IUnknown
 {
     void SetInhibitAppSleep(bool inhibitAppSleep, char* reason);
 }
+
+[uuid(22edf20d-5803-2d3f-9247-b4842e5e9322)]
+interface IAvnPlatformRenderTimer : IUnknown
+{
+    HRESULT RegisterTick(IAvnActionCallback* callback);
+    void Start();
+    void Stop();
+    bool RunsInBackground();
+}

From 039b19f585c093f9f70a45a3eb4871db64f95c72 Mon Sep 17 00:00:00 2001
From: zhangxi <526684540@qq.com>
Date: Thu, 24 Aug 2023 17:58:05 +0800
Subject: [PATCH 79/80] =?UTF-8?q?fix=20polygon/polyline=20load=20fail=20po?=
 =?UTF-8?q?ints=20within=20the=20template=EF=BC=9A=20Optimization=20fixed?=
 =?UTF-8?q?=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Avalonia.Controls/Shapes/Polygon.cs  | 8 +++++++-
 src/Avalonia.Controls/Shapes/Polyline.cs | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Shapes/Polygon.cs b/src/Avalonia.Controls/Shapes/Polygon.cs
index 2d56ced31d..e51e117e33 100644
--- a/src/Avalonia.Controls/Shapes/Polygon.cs
+++ b/src/Avalonia.Controls/Shapes/Polygon.cs
@@ -1,18 +1,24 @@
 using System.Collections.Generic;
 using Avalonia.Media;
+using Avalonia.Data;
 
 namespace Avalonia.Controls.Shapes
 {
     public class Polygon : Shape
     {
         public static readonly StyledProperty<IList<Point>> PointsProperty =
-            AvaloniaProperty.Register<Polygon, IList<Point>>("Points", new Points());
+            AvaloniaProperty.Register<Polygon, IList<Point>>("Points");
 
         static Polygon()
         {
             AffectsGeometry<Polygon>(PointsProperty);
         }
 
+        public Polygon()
+        {
+            SetValue(PointsProperty, new Points(), BindingPriority.Template);
+        }
+
         public IList<Point> Points
         {
             get => GetValue(PointsProperty);
diff --git a/src/Avalonia.Controls/Shapes/Polyline.cs b/src/Avalonia.Controls/Shapes/Polyline.cs
index 63c37780c5..dc28b7b34a 100644
--- a/src/Avalonia.Controls/Shapes/Polyline.cs
+++ b/src/Avalonia.Controls/Shapes/Polyline.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Avalonia.Media;
+using Avalonia.Data;
 
 namespace Avalonia.Controls.Shapes
 {
@@ -14,6 +15,11 @@ namespace Avalonia.Controls.Shapes
             AffectsGeometry<Polyline>(PointsProperty);
         }
 
+        public Polyline()
+        {
+            SetValue(PointsProperty, new Points(), BindingPriority.Template);
+        }
+
         public IList<Point> Points
         {
             get => GetValue(PointsProperty);

From 79e4d9b1e0890652270bc4cfe1c7e5cdc9d8c3c4 Mon Sep 17 00:00:00 2001
From: zhangxi <526684540@qq.com>
Date: Thu, 24 Aug 2023 18:40:15 +0800
Subject: [PATCH 80/80] Polyline points remove defalut value

---
 src/Avalonia.Controls/Shapes/Polyline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Shapes/Polyline.cs b/src/Avalonia.Controls/Shapes/Polyline.cs
index dc28b7b34a..84fccb66f1 100644
--- a/src/Avalonia.Controls/Shapes/Polyline.cs
+++ b/src/Avalonia.Controls/Shapes/Polyline.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Controls.Shapes
     public class Polyline : Shape
     {
         public static readonly StyledProperty<IList<Point>> PointsProperty =
-            AvaloniaProperty.Register<Polyline, IList<Point>>("Points", new Points());
+            AvaloniaProperty.Register<Polyline, IList<Point>>("Points");
 
         static Polyline()
         {