From 11c1543b5a53301cc6d6ff9ae2c74085242566a5 Mon Sep 17 00:00:00 2001
From: Lubomir Tetak <l.tetak.ext@sportradar.com>
Date: Mon, 22 Nov 2021 10:53:25 +0100
Subject: [PATCH 01/34] Handle default actions to prevent beeping sounds

---
 samples/ControlCatalog/Pages/DialogsPage.xaml.cs | 3 ++-
 src/Avalonia.Controls/Button.cs                  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index 49921fb7f6..cc1b8e4f5a 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -128,7 +128,8 @@ namespace ControlCatalog.Pages
                         (button = new Button
                         {
                             HorizontalAlignment = HorizontalAlignment.Center,
-                            Content = "Click to close"
+                            Content = "Click to close",
+                            IsDefault = true
                         })
                     }
                 },
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 8b22cdd4ec..34180225e0 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -547,6 +547,7 @@ namespace Avalonia.Controls
             if (e.Key == Key.Enter && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 
@@ -560,6 +561,7 @@ namespace Avalonia.Controls
             if (e.Key == Key.Escape && IsVisible && IsEnabled)
             {
                 OnClick();
+                e.Handled = true;
             }
         }
 

From ccbd277e8bf46f31efeeb7c8a9b428b4a9a9eaf6 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Wed, 24 Nov 2021 10:23:18 +0100
Subject: [PATCH 02/34] feat(ContentPresenter): Content of ContentPresenter
 should become DataContext of the subtree whenever ContentTemplate is not null

---
 .../Presenters/ContentPresenter.cs            | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 9886dd913a..93acd88fb1 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -107,9 +107,6 @@ namespace Avalonia.Controls.Presenters
             AffectsRender<ContentPresenter>(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
             AffectsArrange<ContentPresenter>(HorizontalContentAlignmentProperty, VerticalContentAlignmentProperty);
             AffectsMeasure<ContentPresenter>(BorderThicknessProperty, PaddingProperty);
-            ContentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            ContentTemplateProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.ContentChanged(e));
-            TemplatedParentProperty.Changed.AddClassHandler<ContentPresenter>((x, e) => x.TemplatedParentChanged(e));
         }
 
         public ContentPresenter()
@@ -240,6 +237,21 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+            switch (change.Property.Name)
+            {
+                case nameof(Content):
+                case nameof(ContentTemplate):
+                    ContentChanged(change);
+                    break;
+                case nameof(TemplatedParent):
+                    TemplatedParentChanged(change);
+                    break;
+            }
+        }
+
         /// <summary>
         /// Updates the <see cref="Child"/> control based on the control's <see cref="Content"/>.
         /// </summary>
@@ -254,8 +266,14 @@ namespace Avalonia.Controls.Presenters
         public void UpdateChild()
         {
             var content = Content;
+            UpdateChild(content);
+        }
+
+        private void UpdateChild(object? content)
+        {
+            var contentTemplate = ContentTemplate;
             var oldChild = Child;
-            var newChild = CreateChild();
+            var newChild = CreateChild(content, oldChild, contentTemplate);
             var logicalChildren = Host?.LogicalChildren ?? LogicalChildren;
 
             // Remove the old child if we're not recycling it.
@@ -271,7 +289,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             // Set the DataContext if the data isn't a control.
-            if (!(content is IControl))
+            if (contentTemplate is { } || !(content is IControl))
             {
                 DataContext = content;
             }
@@ -299,6 +317,7 @@ namespace Avalonia.Controls.Presenters
             }
 
             _createdChild = true;
+
         }
 
         /// <inheritdoc/>
@@ -325,18 +344,23 @@ namespace Avalonia.Controls.Presenters
         {
             var content = Content;
             var oldChild = Child;
+            return CreateChild(content, oldChild, ContentTemplate);
+        }
+
+        private IControl? CreateChild(object? content, IControl? oldChild, IDataTemplate? template)
+        {            
             var newChild = content as IControl;
 
             // We want to allow creating Child from the Template, if Content is null.
             // But it's important to not use DataTemplates, otherwise we will break content presenters in many places,
             // otherwise it will blow up every ContentPresenter without Content set.
-            if (newChild == null
-                && (content != null || ContentTemplate != null))
+            if ((newChild == null 
+                && (content != null || template != null)) || (newChild is { } && template is { }))
             {
-                var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? 
+                var dataTemplate = this.FindDataTemplate(content, template) ??
                     (
-                        RecognizesAccessKey 
-                            ? FuncDataTemplate.Access 
+                        RecognizesAccessKey
+                            ? FuncDataTemplate.Access
                             : FuncDataTemplate.Default
                     );
 
@@ -446,7 +470,14 @@ namespace Avalonia.Controls.Presenters
 
             if (((ILogical)this).IsAttachedToLogicalTree)
             {
-                UpdateChild();
+                if (e.Property.Name == nameof(Content))
+                {
+                    UpdateChild(e.NewValue);
+                }
+                else
+                {
+                    UpdateChild();
+                }
             }
             else if (Child != null)
             {

From e2e3eba71d8e74574c7bd9416832f4b30e620b54 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 10 Mar 2022 18:35:22 +0100
Subject: [PATCH 03/34] add test

---
 .../ContentPresenterTests_InTemplate.cs       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index a579e869b0..76a47ea3d1 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -353,6 +353,30 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Null(target.Host);
         }
 
+        [Fact]
+        public void Content_Should_Become_Datacontext_When_ControlTemplate_Is_Not_Null()
+        {
+            var (target, _) = CreateTarget();
+
+            var textBlock = new TextBlock
+            {
+                [!TextBlock.TextProperty] = new Binding("Name"),
+            };
+
+            var canvas = new Canvas()
+            {
+                Name ="Canvas",
+            };
+
+            target.ContentTemplate = new FuncDataTemplate<Canvas>((_, __) => textBlock);
+            target.Content = canvas;
+
+            Assert.NotNull(target.DataContext);
+            Assert.Equal(canvas, target.DataContext);
+            Assert.Equal("Canvas", textBlock.Text);
+        }
+
+
         (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
         {
             var templatedParent = new ContentControl

From ad9b7c1027f50f11e89f9117fcecda2cbdb85377 Mon Sep 17 00:00:00 2001
From: Tim U <tim.uniewki@gmail.com>
Date: Fri, 11 Mar 2022 12:47:07 +0100
Subject: [PATCH 04/34] Switch disposing order for TwoWayBindingDisposable

---
 src/Avalonia.Base/Data/BindingOperations.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 5353e8175d..0c38f78c83 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -116,8 +116,8 @@ namespace Avalonia.Data
                     return;
                 }
 
-                _first.Dispose();
                 _second.Dispose();
+                _first.Dispose();
 
                 _isDisposed = true;
             }

From ed85fb770ef2d0eb63244a1f765ec20243daf9e9 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Fri, 11 Mar 2022 22:10:35 +0800
Subject: [PATCH 05/34] Update ContentPresenterTests_InTemplate.cs

---
 .../Presenters/ContentPresenterTests_InTemplate.cs               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index 76a47ea3d1..c0d475842a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -376,7 +376,6 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal("Canvas", textBlock.Text);
         }
 
-
         (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
         {
             var templatedParent = new ContentControl

From 6e8c5f9927222605879b65c715cff7da4b0c80f2 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Fri, 11 Mar 2022 22:11:18 +0800
Subject: [PATCH 06/34] Update ContentPresenterTests_InTemplate.cs

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

diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index c0d475842a..6d20c72674 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -354,7 +354,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
         }
 
         [Fact]
-        public void Content_Should_Become_Datacontext_When_ControlTemplate_Is_Not_Null()
+        public void Content_Should_Become_DataContext_When_ControlTemplate_Is_Not_Null()
         {
             var (target, _) = CreateTarget();
 
@@ -365,7 +365,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var canvas = new Canvas()
             {
-                Name ="Canvas",
+                Name = "Canvas"
             };
 
             target.ContentTemplate = new FuncDataTemplate<Canvas>((_, __) => textBlock);

From 3d0a13d2ba2a5fb733d0d0c6fd9337d435bf1e97 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Fri, 4 Mar 2022 22:04:48 +0100
Subject: [PATCH 07/34] Add TransitioningContentControl-DemoPage

---
 samples/ControlCatalog/ControlCatalog.csproj  |   6 +
 samples/ControlCatalog/MainView.xaml          |   3 +
 .../TransitioningContentControlPage.axaml     |  35 ++++++
 .../TransitioningContentControlPage.axaml.cs  |  19 +++
 ...ransitioningContentControlPageViewModel.cs | 110 ++++++++++++++++++
 5 files changed, 173 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
 create mode 100644 samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
 create mode 100644 samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index c0e24357ca..117a9fad61 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -28,5 +28,11 @@
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Pages\TransitioningContentControlPage.axaml.cs">
+      <DependentUpon>TransitioningContentControlPage.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index facce2aa82..f3b52428ca 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -145,6 +145,9 @@
       <TabItem Header="ToolTip">
         <pages:ToolTipPage />
       </TabItem>
+      <TabItem Header="TransitioningContentControl">
+        <pages:TransitioningContentControlPage />
+      </TabItem>
       <TabItem Header="TreeView">
         <pages:TreeViewPage />
       </TabItem>
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
new file mode 100644
index 0000000000..20cd78abd3
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -0,0 +1,35 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:ControlCatalog.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:TransitioningContentControlPageViewModel"
+             x:CompileBindings="True"
+             x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
+
+    <UserControl.DataContext>
+        <vm:TransitioningContentControlPageViewModel />
+    </UserControl.DataContext>
+    <DockPanel LastChildFill="True">
+
+        <TextBlock DockPanel.Dock="Top" Classes="h2">The TransitioningContentControl control allows you to show a page transition whenever the Content changes.</TextBlock>
+
+        <Border DockPanel.Dock="Bottom" Background="{DynamicResource ThemeControlLowBrush}">
+            <StackPanel Margin="5" Spacing="5">
+                <TextBlock>Select a transition</TextBlock>
+               <ComboBox Items="{Binding PageTransitions}" SelectedItem="{Binding SelectedTransition}" /> 
+            </StackPanel>
+        </Border>
+        
+        <Button DockPanel.Dock="Left" Command="{Binding PrevImage}" Content="&lt;" />
+        <Button DockPanel.Dock="Right" Command="{Binding NextImage}" Content=">" />
+<TransitioningContentControl Content="{Binding SelectedImage}" PageTransition="{Binding SelectedTransition.Transition}" >
+    <TransitioningContentControl.ContentTemplate>
+        <DataTemplate DataType="Bitmap">
+            <Image Source="{Binding}"  />
+        </DataTemplate>
+    </TransitioningContentControl.ContentTemplate>
+</TransitioningContentControl>
+</DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
new file mode 100644
index 0000000000..2851a6c890
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class TransitioningContentControlPage : UserControl
+    {
+        public TransitioningContentControlPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
new file mode 100644
index 0000000000..edf3579ac9
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class TransitioningContentControlPageViewModel : ViewModelBase
+    {
+        public TransitioningContentControlPageViewModel()
+        {
+            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+
+            var images = new string[] 
+            { 
+                "delicate-arch-896885_640.jpg", 
+                "hirsch-899118_640.jpg", 
+                "maple-leaf-888807_640.jpg" 
+            };
+
+            foreach (var image in images)
+            {
+                var path = $"avares://ControlCatalog/Assets/{image}";
+                Images.Add(new Bitmap(assetLoader.Open(new Uri(path))));
+            }
+
+            SelectedImage = Images[0];
+            SelectedTransition = PageTransitions[0];
+        }
+
+        public List<PageTransition> PageTransitions { get; } = new List<PageTransition>()
+        {
+            new PageTransition("Slide horizontally", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Horizontal)),
+            new PageTransition("Slide vertically", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Vertical))
+        };
+
+        public List<Bitmap> Images { get; } = new List<Bitmap>();
+
+
+        private Bitmap? _SelectedImage;
+
+        /// <summary>
+        /// Gets or Sets the selected image
+        /// </summary>
+        public Bitmap? SelectedImage
+        {
+            get { return _SelectedImage; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedImage, value); }
+        }
+
+
+        private PageTransition _SelectedTransition;
+
+        /// <summary>
+        /// Gets or sets the transition to play
+        /// </summary>
+        public PageTransition SelectedTransition
+        {
+            get { return _SelectedTransition; }
+            set { this.RaiseAndSetIfChanged(ref _SelectedTransition, value); }
+        }
+
+        public void NextImage()
+        {
+            var index = Images.IndexOf(SelectedImage) + 1;
+            
+            if (index >= Images.Count)
+            {
+                index = 0;
+            }
+
+            SelectedImage = Images[index];
+        }
+
+        public void PrevImage()
+        {
+            var index = Images.IndexOf(SelectedImage) - 1;
+
+            if (index < 0)
+            {
+                index = Images.Count-1;
+            }
+
+            SelectedImage = Images[index];
+        }
+    }
+
+    public class PageTransition
+    {
+        public PageTransition(string displayTitle, IPageTransition transition)
+        {
+            DisplayTitle = displayTitle;
+            Transition = transition;
+        }
+
+        public string DisplayTitle { get; }
+        public IPageTransition Transition { get; }
+
+        public override string ToString()
+        {
+            return DisplayTitle;
+        }
+
+    }
+}

From 799692fb563be235c6a2abc503ffb9d32b733a9d Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Sat, 5 Mar 2022 10:51:52 +0100
Subject: [PATCH 08/34] Improve demo

---
 .../TransitioningContentControlPage.axaml     | 67 +++++++++++++++----
 ...ransitioningContentControlPageViewModel.cs | 51 +++++++++++++-
 2 files changed, 101 insertions(+), 17 deletions(-)

diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
index 20cd78abd3..4e26141082 100644
--- a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:ControlCatalog.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             Height="{Binding $parent[ScrollViewer].Bounds.Height}"
              x:DataType="vm:TransitioningContentControlPageViewModel"
              x:CompileBindings="True"
              x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
@@ -11,25 +12,63 @@
     <UserControl.DataContext>
         <vm:TransitioningContentControlPageViewModel />
     </UserControl.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="HeaderedContentControl">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="HeaderCol" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding Header}" 
+                                              Grid.Column="0" 
+                                              VerticalAlignment="Center" />
+                            <ContentPresenter Content="{TemplateBinding Content}" 
+                                              Grid.Column="1" 
+                                              VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Styles>
     <DockPanel LastChildFill="True">
 
         <TextBlock DockPanel.Dock="Top" Classes="h2">The TransitioningContentControl control allows you to show a page transition whenever the Content changes.</TextBlock>
 
-        <Border DockPanel.Dock="Bottom" Background="{DynamicResource ThemeControlLowBrush}">
-            <StackPanel Margin="5" Spacing="5">
-                <TextBlock>Select a transition</TextBlock>
-               <ComboBox Items="{Binding PageTransitions}" SelectedItem="{Binding SelectedTransition}" /> 
+        <ExperimentalAcrylicBorder DockPanel.Dock="Bottom" Margin="10" CornerRadius="5" >
+            <ExperimentalAcrylicBorder.Material>
+                <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintColor="White" />
+            </ExperimentalAcrylicBorder.Material>
+            
+            <StackPanel Margin="5" Spacing="5" Grid.IsSharedSizeScope="True">
+                <HeaderedContentControl Header="Select a transition">
+                     <ComboBox Items="{Binding PageTransitions}" SelectedItem="{Binding SelectedTransition}" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Duration">
+                     <NumericUpDown Value="{Binding Duration}" Increment="250" Minimum="100" />
+                </HeaderedContentControl>
+                <HeaderedContentControl Header="Clip to Bounds">
+                    <ToggleSwitch IsChecked="{Binding ClipToBounds}" />
+                </HeaderedContentControl>
             </StackPanel>
-        </Border>
-        
+        </ExperimentalAcrylicBorder>
+
         <Button DockPanel.Dock="Left" Command="{Binding PrevImage}" Content="&lt;" />
         <Button DockPanel.Dock="Right" Command="{Binding NextImage}" Content=">" />
-<TransitioningContentControl Content="{Binding SelectedImage}" PageTransition="{Binding SelectedTransition.Transition}" >
-    <TransitioningContentControl.ContentTemplate>
-        <DataTemplate DataType="Bitmap">
-            <Image Source="{Binding}"  />
-        </DataTemplate>
-    </TransitioningContentControl.ContentTemplate>
-</TransitioningContentControl>
-</DockPanel>
+        
+        <Border ClipToBounds="{Binding ClipToBounds}" Margin="5">
+            <TransitioningContentControl Content="{Binding SelectedImage}"
+                                         PageTransition="{Binding SelectedTransition.Transition}" >
+                <TransitioningContentControl.ContentTemplate>
+                    <DataTemplate DataType="Bitmap">
+                        <Image Source="{Binding}"  />
+                    </DataTemplate>
+                </TransitioningContentControl.ContentTemplate>
+            </TransitioningContentControl>
+        </Border>
+    </DockPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
index edf3579ac9..98383e45c7 100644
--- a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
@@ -30,11 +30,13 @@ namespace ControlCatalog.ViewModels
             }
 
             SelectedImage = Images[0];
-            SelectedTransition = PageTransitions[0];
+            SelectedTransition = PageTransitions[1];
         }
 
         public List<PageTransition> PageTransitions { get; } = new List<PageTransition>()
         {
+            new PageTransition("None", null),
+            new PageTransition("CrossFade", new CrossFade(TimeSpan.FromMilliseconds(500))),
             new PageTransition("Slide horizontally", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Horizontal)),
             new PageTransition("Slide vertically", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Vertical))
         };
@@ -65,6 +67,38 @@ namespace ControlCatalog.ViewModels
             set { this.RaiseAndSetIfChanged(ref _SelectedTransition, value); }
         }
 
+
+
+        private bool _ClipToBounds;
+
+        /// <summary>
+        /// Gets or sets if the content should be clipped to bounds
+        /// </summary>
+        public bool ClipToBounds
+        {
+            get { return _ClipToBounds; }
+            set { this.RaiseAndSetIfChanged(ref _ClipToBounds, value); }
+        }
+
+
+        private int _Duration = 500;
+
+        /// <summary>
+        /// Gets or Sets the duration
+        /// </summary>
+        public int Duration 
+        {
+            get { return _Duration; }
+            set 
+            { 
+                this.RaiseAndSetIfChanged(ref _Duration , value);
+
+                PageTransitions[1].Transition = new CrossFade(TimeSpan.FromMilliseconds(value));
+                PageTransitions[2].Transition = new PageSlide(TimeSpan.FromMilliseconds(value), PageSlide.SlideAxis.Horizontal);
+                PageTransitions[3].Transition = new PageSlide(TimeSpan.FromMilliseconds(value), PageSlide.SlideAxis.Vertical);
+            }
+        }
+
         public void NextImage()
         {
             var index = Images.IndexOf(SelectedImage) + 1;
@@ -90,7 +124,7 @@ namespace ControlCatalog.ViewModels
         }
     }
 
-    public class PageTransition
+    public class PageTransition : ViewModelBase
     {
         public PageTransition(string displayTitle, IPageTransition transition)
         {
@@ -99,7 +133,18 @@ namespace ControlCatalog.ViewModels
         }
 
         public string DisplayTitle { get; }
-        public IPageTransition Transition { get; }
+
+
+        private IPageTransition _Transition;
+
+        /// <summary>
+        /// Gets or sets the transition
+        /// </summary>
+        public IPageTransition Transition
+        {
+            get { return _Transition; }
+            set { this.RaiseAndSetIfChanged(ref _Transition, value); }
+        }
 
         public override string ToString()
         {

From c9a5a329303c765b55b5c67c3e048a24e6c9df91 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Tue, 8 Mar 2022 07:58:49 +0100
Subject: [PATCH 09/34] Add composite transition and custom transition

---
 ...ransitioningContentControlPageViewModel.cs | 180 ++++++++++++++++--
 1 file changed, 167 insertions(+), 13 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
index 98383e45c7..b092a07f4a 100644
--- a/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/TransitioningContentControlPageViewModel.cs
@@ -2,10 +2,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Animation;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
 using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
@@ -29,17 +34,13 @@ namespace ControlCatalog.ViewModels
                 Images.Add(new Bitmap(assetLoader.Open(new Uri(path))));
             }
 
-            SelectedImage = Images[0];
+            SetupTransitions();
+
             SelectedTransition = PageTransitions[1];
+            SelectedImage = Images[0];
         }
 
-        public List<PageTransition> PageTransitions { get; } = new List<PageTransition>()
-        {
-            new PageTransition("None", null),
-            new PageTransition("CrossFade", new CrossFade(TimeSpan.FromMilliseconds(500))),
-            new PageTransition("Slide horizontally", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Horizontal)),
-            new PageTransition("Slide vertically", new PageSlide(TimeSpan.FromMilliseconds(500), PageSlide.SlideAxis.Vertical))
-        };
+        public List<PageTransition> PageTransitions { get; } = new List<PageTransition>();
 
         public List<Bitmap> Images { get; } = new List<Bitmap>();
 
@@ -92,11 +93,36 @@ namespace ControlCatalog.ViewModels
             set 
             { 
                 this.RaiseAndSetIfChanged(ref _Duration , value);
+                SetupTransitions();
+            }
+        }
 
-                PageTransitions[1].Transition = new CrossFade(TimeSpan.FromMilliseconds(value));
-                PageTransitions[2].Transition = new PageSlide(TimeSpan.FromMilliseconds(value), PageSlide.SlideAxis.Horizontal);
-                PageTransitions[3].Transition = new PageSlide(TimeSpan.FromMilliseconds(value), PageSlide.SlideAxis.Vertical);
+        private void SetupTransitions()
+        {
+            if (PageTransitions.Count == 0)
+            {
+                PageTransitions.AddRange(new[] 
+                {
+                    new PageTransition("None"),
+                    new PageTransition("CrossFade"),
+                    new PageTransition("Slide horizontally"),
+                    new PageTransition("Slide vertically"),
+                    new PageTransition("Composite"),
+                    new PageTransition("Custom")
+                });
             }
+
+            PageTransitions[1].Transition = new CrossFade(TimeSpan.FromMilliseconds(Duration));
+            PageTransitions[2].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Horizontal);
+            PageTransitions[3].Transition = new PageSlide(TimeSpan.FromMilliseconds(Duration), PageSlide.SlideAxis.Vertical);
+
+            var compositeTransition = new CompositePageTransition();
+            compositeTransition.PageTransitions.Add(PageTransitions[1].Transition);
+            compositeTransition.PageTransitions.Add(PageTransitions[2].Transition);
+            compositeTransition.PageTransitions.Add(PageTransitions[3].Transition);
+            PageTransitions[4].Transition = compositeTransition;
+
+            PageTransitions[5].Transition = new CustomTransition(TimeSpan.FromMilliseconds(Duration));
         }
 
         public void NextImage()
@@ -126,10 +152,9 @@ namespace ControlCatalog.ViewModels
 
     public class PageTransition : ViewModelBase
     {
-        public PageTransition(string displayTitle, IPageTransition transition)
+        public PageTransition(string displayTitle)
         {
             DisplayTitle = displayTitle;
-            Transition = transition;
         }
 
         public string DisplayTitle { get; }
@@ -152,4 +177,133 @@ namespace ControlCatalog.ViewModels
         }
 
     }
+
+    public class CustomTransition : IPageTransition
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        public CustomTransition()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomTransition"/> class.
+        /// </summary>
+        /// <param name="duration">The duration of the animation.</param>
+        public CustomTransition(TimeSpan duration)
+        {
+            Duration = duration;
+        }
+
+        /// <summary>
+        /// Gets the duration of the animation.
+        /// </summary>
+        public TimeSpan Duration { get; set; }
+
+        public async Task Start(Visual from, Visual to, bool forward, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var tasks = new List<Task>();
+            var parent = GetVisualParent(from, to);
+            var scaleProperty = ScaleTransform.ScaleYProperty;
+
+            if (from != null)
+            {
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(from, null, cancellationToken));
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                var animation = new Animation
+                {
+                    FillMode = FillMode.Forward,
+                    Children =
+                    {
+                        new KeyFrame
+                        {
+                            Setters =
+                            {
+                                new Setter
+                                {
+                                    Property = scaleProperty,
+                                    Value = 0d
+                                }
+                            },
+                            Cue = new Cue(0d)
+                        },
+                        new KeyFrame
+                        {
+                            Setters = { new Setter { Property = scaleProperty, Value = 1d } },
+                            Cue = new Cue(1d)
+                        }
+                    },
+                    Duration = Duration
+                };
+                tasks.Add(animation.RunAsync(to, null, cancellationToken));
+            }
+
+            await Task.WhenAll(tasks);
+
+            if (from != null && !cancellationToken.IsCancellationRequested)
+            {
+                from.IsVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the common visual parent of the two control.
+        /// </summary>
+        /// <param name="from">The from control.</param>
+        /// <param name="to">The to control.</param>
+        /// <returns>The common parent.</returns>
+        /// <exception cref="ArgumentException">
+        /// The two controls do not share a common parent.
+        /// </exception>
+        /// <remarks>
+        /// Any one of the parameters may be null, but not both.
+        /// </remarks>
+        private static IVisual GetVisualParent(IVisual? from, IVisual? to)
+        {
+            var p1 = (from ?? to)!.VisualParent;
+            var p2 = (to ?? from)!.VisualParent;
+
+            if (p1 != null && p2 != null && p1 != p2)
+            {
+                throw new ArgumentException("Controls for PageSlide must have same parent.");
+            }
+
+            return p1 ?? throw new InvalidOperationException("Cannot determine visual parent.");
+        }
+    }
 }

From 05e752d01abb1408568bf79480ab4733e63816bf Mon Sep 17 00:00:00 2001
From: Tim U <tim.uniewki@gmail.com>
Date: Tue, 8 Mar 2022 14:36:51 +0100
Subject: [PATCH 10/34] minor layout tweaks

---
 .../Converter/MathSubtractConverter.cs         | 18 ++++++++++++++++++
 .../TransitioningContentControlPage.axaml      | 12 ++++++++++--
 .../HamburgerMenu/HamburgerMenu.xaml           |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 samples/ControlCatalog/Converter/MathSubtractConverter.cs

diff --git a/samples/ControlCatalog/Converter/MathSubtractConverter.cs b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
new file mode 100644
index 0000000000..009a56c0ec
--- /dev/null
+++ b/samples/ControlCatalog/Converter/MathSubtractConverter.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace ControlCatalog.Converter;
+
+public class MathSubtractConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return (double)value - (double)parameter;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
index 4e26141082..a410577d27 100644
--- a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -3,8 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:ControlCatalog.ViewModels"
+             xmlns:converter="clr-namespace:ControlCatalog.Converter"
+             xmlns:system="using:System"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             Height="{Binding $parent[ScrollViewer].Bounds.Height}"
              x:DataType="vm:TransitioningContentControlPageViewModel"
              x:CompileBindings="True"
              x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
@@ -35,7 +36,14 @@
             </Setter>
         </Style>
     </UserControl.Styles>
-    <DockPanel LastChildFill="True">
+  
+  <UserControl.Resources>
+    <converter:MathSubtractConverter x:Key="MathSubtractConverter" />
+    <system:Double x:Key="TopMargin">8</system:Double>
+  </UserControl.Resources>
+  
+    <DockPanel LastChildFill="True" 
+               Height="{Binding Path=Bounds.Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Converter={StaticResource MathSubtractConverter},ConverterParameter={StaticResource TopMargin}}">
 
         <TextBlock DockPanel.Dock="Top" Classes="h2">The TransitioningContentControl control allows you to show a page transition whenever the Content changes.</TextBlock>
 
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 1aa7f8ea04..e0dfa49a44 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -22,7 +22,7 @@
 
   <Styles.Resources>
     <x:Double x:Key="PaneCompactWidth">40</x:Double>
-    <x:Double x:Key="PaneExpandWidth">200</x:Double>
+    <x:Double x:Key="PaneExpandWidth">220</x:Double>
     <x:Double x:Key="HeaderHeight">36</x:Double>
     <x:Double x:Key="NavigationItemHeight">36</x:Double>
     <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>

From c2f5bad49551172316d1e0d0bc7078f22d194828 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Fri, 11 Mar 2022 14:43:33 +0800
Subject: [PATCH 11/34] Update ControlCatalog.csproj

---
 samples/ControlCatalog/ControlCatalog.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 117a9fad61..c0e24357ca 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -28,11 +28,5 @@
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Pages\TransitioningContentControlPage.axaml.cs">
-      <DependentUpon>TransitioningContentControlPage.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>

From 8c8fb23c40d531fdc59b32a5de8e2f5eb5a14ec8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Mar 2022 12:15:38 -0400
Subject: [PATCH 12/34] Make android test application buildable

---
 .../Avalonia.AndroidTestApplication.csproj    |  8 +++-
 .../MainActivity.cs                           | 39 +++++++------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 8cb7aa1cfd..548393fb2f 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -11,7 +11,13 @@
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <DebugType>portable</DebugType>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <AndroidResource Include="..\..\..\build\Assets\Icon.png">
+      <Link>Resources\drawable\Icon.png</Link>
+    </AndroidResource>
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
     <DebugSymbols>True</DebugSymbols>
     <RunAOTCompilation>True</RunAOTCompilation>
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index 471b982d9e..e34fa6cf7b 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -1,9 +1,9 @@
 using System;
 using Android.App;
 using Android.Content.PM;
-using Android.OS;
 using Avalonia.Android;
 using Avalonia.Controls;
+using Avalonia.Input.TextInput;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Styling;
@@ -14,22 +14,15 @@ namespace Avalonia.AndroidTestApplication
     [Activity(Label = "Main",
         MainLauncher = true,
         Icon = "@drawable/icon",
-         Theme = "@style/Theme.AppCompat.NoActionBar",
-         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
+        Theme = "@style/Theme.AppCompat.NoActionBar",
+        ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
         LaunchMode = LaunchMode.SingleInstance/*,
         ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : AvaloniaActivity
+    public class MainActivity : AvaloniaActivity<App>
     {
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         {
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-            base.OnCreate(savedInstanceState);
-            Content = App.CreateSimpleWindow();
+            return base.CustomizeAppBuilder(builder);
         }
     }
 
@@ -42,8 +35,6 @@ namespace Avalonia.AndroidTestApplication
             var baseLight = (IStyle)AvaloniaXamlLoader.Load(
                 new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
             Styles.Add(baseLight);
-
-
         }
 
         // This provides a simple UI tree for testing input handling, drawing, etc
@@ -76,12 +67,12 @@ namespace Avalonia.AndroidTestApplication
                             Foreground = Brushes.Black
                         },
 
-                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
+                        CreateTextBox(TextInputContentType.Normal),
+                        CreateTextBox(TextInputContentType.Password),
+                        CreateTextBox(TextInputContentType.Email),
+                        CreateTextBox(TextInputContentType.Url),
+                        CreateTextBox(TextInputContentType.Digits),
+                        CreateTextBox(TextInputContentType.Number),
                     }
                 }
             };
@@ -89,16 +80,16 @@ namespace Avalonia.AndroidTestApplication
             return window;
         }
 
-        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
+        private static TextBox CreateTextBox(TextInputContentType contentType)
         {
             var textBox = new TextBox()
             {
                 Margin = new Thickness(20, 10),
                 Watermark = contentType.ToString(),
                 BorderThickness = new Thickness(3),
-                FontSize = 20
+                FontSize = 20,
+                [TextInputOptions.ContentTypeProperty] = contentType
             };
-            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
 
             return textBox;
         }

From e91b3318e33746e59ef6e93fc3a1b48b9159be04 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Mar 2022 13:00:47 -0400
Subject: [PATCH 13/34] Enable AOT on android projects (release configuration
 only)

---
 samples/ControlCatalog.Android/ControlCatalog.Android.csproj   | 3 ++-
 .../Avalonia.AndroidTestApplication.csproj                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 516acfe4b9..9777bb46c3 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -21,8 +21,9 @@
 
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
     <DebugSymbols>True</DebugSymbols>
-    <RunAOTCompilation>False</RunAOTCompilation>
+    <RunAOTCompilation>True</RunAOTCompilation>
     <EnableLLVM>True</EnableLLVM>
+    <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 548393fb2f..db0bb01410 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -22,7 +22,7 @@
     <DebugSymbols>True</DebugSymbols>
     <RunAOTCompilation>True</RunAOTCompilation>
     <EnableLLVM>True</EnableLLVM>
-    <!--<AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>-->
+    <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
   </PropertyGroup>
   
   <ItemGroup>

From ab46885d62262441614c5069ffbe9ef821a0adce Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Mar 2022 13:01:05 -0400
Subject: [PATCH 14/34] Fix Visual Studio android projects build

---
 packages/Avalonia/Avalonia.csproj              | 4 +++-
 src/Avalonia.MicroCom/Avalonia.MicroCom.csproj | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4b28527465..4d0ed866a3 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -8,7 +8,9 @@
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" >
         <PrivateAssets>all</PrivateAssets>
-      </ProjectReference>  
+        <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+        <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+      </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index b796e173c4..d7f39f6642 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -10,6 +10,8 @@
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />

From 3fe50be1683a3bba081b726c1c87728f6bf0b4d9 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Mar 2022 13:02:00 -0400
Subject: [PATCH 15/34] Update AndroidTestApplication futher

---
 .../MainActivity.cs                               | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index e34fa6cf7b..8f4beb2737 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -3,6 +3,7 @@ using Android.App;
 using Android.Content.PM;
 using Avalonia.Android;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input.TextInput;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
@@ -30,11 +31,17 @@ namespace Avalonia.AndroidTestApplication
     {
         public override void Initialize()
         {
-            Styles.Add(new DefaultTheme());
+            Styles.Add(new SimpleTheme(new Uri("avares://Avalonia.AndroidTestApplication")));
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
+            {
+                singleViewLifetime.MainView = CreateSimpleWindow();
+            }
 
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
-            Styles.Add(baseLight);
+            base.OnFrameworkInitializationCompleted();
         }
 
         // This provides a simple UI tree for testing input handling, drawing, etc

From 9ff44b7c0a325074f1f9d1b6bdc13cdbab43413e Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Thu, 17 Mar 2022 17:13:35 +0100
Subject: [PATCH 16/34] Add support for showing binding paths in DevTools.

---
 .../ViewModels/BindingSetterViewModel.cs      | 22 +++++++++++++++++++
 .../ViewModels/ControlDetailsViewModel.cs     | 22 ++++++++++++++++++-
 .../Diagnostics/ViewModels/SetterViewModel.cs |  2 +-
 .../Diagnostics/Views/ControlDetailsView.xaml | 20 +++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
new file mode 100644
index 0000000000..143108421e
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -0,0 +1,22 @@
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class BindingSetterViewModel : SetterViewModel
+    {
+        public BindingSetterViewModel(AvaloniaProperty property, object? value, string bindingPath, bool isCompiled) : base(property, value)
+        {
+            Path = bindingPath;
+            Tint = isCompiled ? Brushes.DarkGreen : Brushes.CornflowerBlue;
+        }
+
+        public IBrush Tint { get; }
+
+        public string Path { get; }
+
+        public override void CopyValue()
+        {
+            CopyToClipboard(Path);
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 8f0a4d07b0..a3a2b0a19c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
@@ -87,7 +88,16 @@ namespace Avalonia.Diagnostics.ViewModels
                                 }
                                 else
                                 {
-                                    setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    var bindingInfo = GetBindingInfo(setterValue);
+
+                                    if (bindingInfo is not null)
+                                    {
+                                        setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue, bindingInfo.Value.path, bindingInfo.Value.isCompiled);
+                                    }
+                                    else
+                                    {
+                                        setterVm = new SetterViewModel(regularSetter.Property, setterValue);
+                                    }
                                 }
 
                                 setters.Add(setterVm);
@@ -117,6 +127,16 @@ namespace Avalonia.Diagnostics.ViewModels
             return null;
         }
 
+        private (string path, bool isCompiled)? GetBindingInfo(object? value)
+        {
+            return value switch
+            {
+                Binding binding => (binding.Path, false),
+                CompiledBindingExtension compiledBinding => (compiledBinding.Path.ToString(), true),
+                _ => null,
+            };
+        }
+
         public TreePageViewModel TreePage { get; }
 
         public DataGridCollectionView? PropertiesView
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
index 38cbefcb93..559ed49911 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Diagnostics.ViewModels
             IsVisible = true;
         }
 
-        public void CopyValue()
+        public virtual void CopyValue()
         {
             var textToCopy = Value?.ToString();
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index d7acbbd577..ec97b213a9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -138,6 +138,26 @@
                           </StackPanel>
                         </DataTemplate>
 
+                        <DataTemplate DataType="vm:BindingSetterViewModel">
+                          <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
+                            <Panel.ContextMenu>
+                              <ContextMenu>
+                                <MenuItem Header="Copy property name" Command="{Binding CopyPropertyName} "/>
+                                <MenuItem Header="Copy value" Command="{Binding CopyValue} "/>
+                              </ContextMenu>
+                            </Panel.ContextMenu>
+                            <StackPanel Orientation="Horizontal" Spacing="2">
+                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Text=":" />
+                              <TextBlock>{</TextBlock>
+                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <TextBlock Text="{Binding Path}" />
+                              <TextBlock>}</TextBlock>
+                            </StackPanel>
+                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                          </Panel>
+                        </DataTemplate>
+
                         <DataTemplate DataType="Color">
                           <StackPanel Orientation="Horizontal" Spacing="2">
                             <Border BorderThickness="1" BorderBrush="Black" Width="8" Height="8">

From d28b6501f6f26660fae2cbe6f3cfeaf6b182db10 Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Thu, 17 Mar 2022 18:07:47 +0100
Subject: [PATCH 17/34] Add support for template bindings.

---
 .../ViewModels/BindingSetterViewModel.cs      | 37 +++++++++++++++++--
 .../ViewModels/ControlDetailsViewModel.cs     | 21 ++++++-----
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
index 143108421e..de3e56e514 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -1,13 +1,42 @@
-using Avalonia.Media;
+using System;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class BindingSetterViewModel : SetterViewModel
     {
-        public BindingSetterViewModel(AvaloniaProperty property, object? value, string bindingPath, bool isCompiled) : base(property, value)
+        public BindingSetterViewModel(AvaloniaProperty property, object? value) : base(property, value)
         {
-            Path = bindingPath;
-            Tint = isCompiled ? Brushes.DarkGreen : Brushes.CornflowerBlue;
+            switch (value)
+            {
+                case Binding binding:
+                    Path = binding.Path;
+                    Tint = Brushes.CornflowerBlue;
+
+                    break;
+                case CompiledBindingExtension binding:
+                    Path = binding.Path.ToString();
+                    Tint = Brushes.DarkGreen;
+
+                    break;
+                case TemplateBinding binding:
+                    if (binding.Property is AvaloniaProperty templateProperty)
+                    {
+                        Path = $"{templateProperty.OwnerType.Name}.{templateProperty.Name}";
+                    }
+                    else
+                    {
+                        Path = "Unassigned";
+                    }
+
+                    Tint = Brushes.OrangeRed;
+
+                    break;
+                default:
+                    throw new ArgumentException("Invalid binding type", nameof(value));
+            }
         }
 
         public IBrush Tint { get; }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index a3a2b0a19c..701947d2ab 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -88,11 +88,11 @@ namespace Avalonia.Diagnostics.ViewModels
                                 }
                                 else
                                 {
-                                    var bindingInfo = GetBindingInfo(setterValue);
+                                    var isBinding = IsBinding(setterValue);
 
-                                    if (bindingInfo is not null)
+                                    if (isBinding)
                                     {
-                                        setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue, bindingInfo.Value.path, bindingInfo.Value.isCompiled);
+                                        setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue);
                                     }
                                     else
                                     {
@@ -127,14 +127,17 @@ namespace Avalonia.Diagnostics.ViewModels
             return null;
         }
 
-        private (string path, bool isCompiled)? GetBindingInfo(object? value)
+        private bool IsBinding(object? value)
         {
-            return value switch
+            switch (value)
             {
-                Binding binding => (binding.Path, false),
-                CompiledBindingExtension compiledBinding => (compiledBinding.Path.ToString(), true),
-                _ => null,
-            };
+                case Binding:
+                case CompiledBindingExtension:
+                case TemplateBinding:
+                    return true;
+            }
+
+            return false;
         }
 
         public TreePageViewModel TreePage { get; }

From 04f9c0b5b6ea217e0df3fb47fc7ad2633e01b130 Mon Sep 17 00:00:00 2001
From: Rustam Sayfutdinov <rstm.sf@gmail.com>
Date: Fri, 18 Mar 2022 15:13:57 +0300
Subject: [PATCH 18/34] Fix getting paths from Uri

---
 Avalonia.sln                                  |  27 ++
 src/Avalonia.Base/Properties/AssemblyInfo.cs  |   1 +
 src/Avalonia.Base/Utilities/UriExtensions.cs  |  70 +++++
 src/Avalonia.PlatformSupport/AssetLoader.cs   | 241 +++---------------
 .../Avalonia.PlatformSupport.csproj           |   5 +
 .../Internal/AssemblyDescriptor.cs            |  42 +++
 .../Internal/AssemblyDescriptorResolver.cs    |  42 +++
 .../Internal/AssetDescriptor.cs               |  52 ++++
 .../Internal/Constants.cs                     |   6 +
 .../Internal/SlicedStream.cs                  |  59 +++++
 .../Media/Fonts/FontFamilyLoader.cs           | 150 +++++++----
 .../Utilities/UriExtensionsTests.cs           |  29 +++
 .../AssetLoaderTests.cs                       |  62 +++++
 .../Avalonia.PlatformSupport.UnitTests.csproj |  24 ++
 tests/Avalonia.UnitTests/MockAssetLoader.cs   |   5 +-
 .../Media/Fonts/FontFamilyLoaderTests.cs      |  45 +++-
 16 files changed, 583 insertions(+), 277 deletions(-)
 create mode 100644 src/Avalonia.Base/Utilities/UriExtensions.cs
 create mode 100644 src/Avalonia.PlatformSupport/Internal/AssemblyDescriptor.cs
 create mode 100644 src/Avalonia.PlatformSupport/Internal/AssemblyDescriptorResolver.cs
 create mode 100644 src/Avalonia.PlatformSupport/Internal/AssetDescriptor.cs
 create mode 100644 src/Avalonia.PlatformSupport/Internal/Constants.cs
 create mode 100644 src/Avalonia.PlatformSupport/Internal/SlicedStream.cs
 create mode 100644 tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
 create mode 100644 tests/Avalonia.PlatformSupport.UnitTests/AssetLoaderTests.cs
 create mode 100644 tests/Avalonia.PlatformSupport.UnitTests/Avalonia.PlatformSupport.UnitTests.csproj

diff --git a/Avalonia.sln b/Avalonia.sln
index a989fb828d..a792774d94 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -234,6 +234,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.PlatformSupport",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.PlatformSupport.UnitTests", "tests\Avalonia.PlatformSupport.UnitTests\Avalonia.PlatformSupport.UnitTests.csproj", "{CE910927-CE5A-456F-BC92-E4C757354A5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -2212,6 +2214,30 @@ Global
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhone.Build.0 = Release|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhone.Build.0 = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{CE910927-CE5A-456F-BC92-E4C757354A5C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2276,6 +2302,7 @@ Global
 		{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{CE910927-CE5A-456F-BC92-E4C757354A5C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/Properties/AssemblyInfo.cs
index 053c7a7547..9ffb5872f0 100644
--- a/src/Avalonia.Base/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Base/Properties/AssemblyInfo.cs
@@ -11,4 +11,5 @@ using Avalonia.Metadata;
 [assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: InternalsVisibleTo("Avalonia.Visuals, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.PlatformSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 
diff --git a/src/Avalonia.Base/Utilities/UriExtensions.cs b/src/Avalonia.Base/Utilities/UriExtensions.cs
new file mode 100644
index 0000000000..c706f72a63
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/UriExtensions.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace Avalonia.Utilities;
+
+internal static class UriExtensions
+{
+    public static bool IsAbsoluteResm(this Uri uri) =>
+        uri.IsAbsoluteUri && uri.IsResm();
+
+    public static bool IsResm(this Uri uri) => uri.Scheme == "resm";
+    
+    public static bool IsAvares(this Uri uri) => uri.Scheme == "avares";
+    
+    public static Uri EnsureAbsolute(this Uri uri, Uri? baseUri)
+    {
+        if (uri.IsAbsoluteUri)
+            return uri;
+        if(baseUri == null)
+            throw new ArgumentException($"Relative uri {uri} without base url");
+        if (!baseUri.IsAbsoluteUri)
+            throw new ArgumentException($"Base uri {baseUri} is relative");
+        if (baseUri.IsResm())
+            throw new ArgumentException(
+                $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
+        return new Uri(baseUri, uri);
+    }
+
+    public static string GetUnescapeAbsolutePath(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsolutePath);
+
+    public static string GetUnescapeAbsoluteUri(this Uri uri) =>
+        Uri.UnescapeDataString(uri.AbsoluteUri);
+    
+    public static string GetAssemblyNameFromQuery(this Uri uri)
+    {
+        const string assembly = "assembly";
+
+        var query = Uri.UnescapeDataString(uri.Query);
+        
+        // Skip the '?'
+        var currentIndex = 1;
+        while (currentIndex < query.Length)
+        {
+            var isFind = false;
+            for (var i = 0; i < assembly.Length; ++currentIndex, ++i)
+                if (query[currentIndex] == assembly[i])
+                {
+                    isFind = i == assembly.Length - 1;
+                }
+                else
+                {
+                    break;
+                }
+
+            // Skip the '='
+            ++currentIndex;
+
+            var beginIndex = currentIndex;
+            while (currentIndex < query.Length && query[currentIndex] != '&')
+                ++currentIndex;
+
+            if (isFind)
+                return query.Substring(beginIndex, currentIndex - beginIndex);
+
+            ++currentIndex;
+        }
+
+        return "";
+    }
+}
diff --git a/src/Avalonia.PlatformSupport/AssetLoader.cs b/src/Avalonia.PlatformSupport/AssetLoader.cs
index 7220694d7b..fb03ec2f6e 100644
--- a/src/Avalonia.PlatformSupport/AssetLoader.cs
+++ b/src/Avalonia.PlatformSupport/AssetLoader.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using Avalonia.Platform;
+using Avalonia.PlatformSupport.Internal;
 using Avalonia.Utilities;
 
 namespace Avalonia.PlatformSupport
@@ -13,12 +14,16 @@ namespace Avalonia.PlatformSupport
     /// </summary>
     public class AssetLoader : IAssetLoader
     {
-        private const string AvaloniaResourceName = "!AvaloniaResources";
-        private static readonly Dictionary<string, AssemblyDescriptor> AssemblyNameCache
-            = new Dictionary<string, AssemblyDescriptor>();
+        private static AssemblyDescriptorResolver s_assemblyDescriptorResolver = new();
 
         private AssemblyDescriptor? _defaultResmAssembly;
 
+        /// <remarks>
+        /// Introduced for tests.
+        /// </remarks>
+        internal static void SetAssemblyDescriptorResolver(AssemblyDescriptorResolver resolver) =>
+            s_assemblyDescriptorResolver = resolver;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AssetLoader"/> class.
         /// </summary>
@@ -109,17 +114,18 @@ namespace Avalonia.PlatformSupport
         /// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
         public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
         {
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
+            if (uri.IsAbsoluteResm())
             {
                 var assembly = GetAssembly(uri);
 
-                return assembly?.Resources?.Where(x => x.Key.Contains(uri.AbsolutePath))
+                return assembly?.Resources?
+                           .Where(x => x.Key.IndexOf(uri.GetUnescapeAbsolutePath(), StringComparison.Ordinal) >= 0)
                            .Select(x =>new Uri($"resm:{x.Key}?assembly={assembly.Name}")) ??
                        Enumerable.Empty<Uri>();
             }
 
-            uri = EnsureAbsolute(uri, baseUri);
-            if (uri.Scheme == "avares")
+            uri = uri.EnsureAbsolute(baseUri);
+            if (uri.IsAvares())
             {
                 var (asm, path) = GetResAsmAndPath(uri);
                 if (asm == null)
@@ -129,33 +135,23 @@ namespace Avalonia.PlatformSupport
                         "don't know where to look up for the resource, try specifying assembly explicitly.");
                 }
 
-                if (asm?.AvaloniaResources == null)
+                if (asm.AvaloniaResources == null)
                     return Enumerable.Empty<Uri>();
-                path = path.TrimEnd('/') + '/';
-                return asm.AvaloniaResources.Where(r => r.Key.StartsWith(path))
+
+                if (path[path.Length - 1] != '/')
+                    path += '/';
+
+                return asm.AvaloniaResources
+                    .Where(r => r.Key.StartsWith(path, StringComparison.Ordinal))
                     .Select(x => new Uri($"avares://{asm.Name}{x.Key}"));
             }
 
             return Enumerable.Empty<Uri>();
         }
-
-        private Uri EnsureAbsolute(Uri uri, Uri? baseUri)
-        {
-            if (uri.IsAbsoluteUri)
-                return uri;
-            if(baseUri == null)
-                throw new ArgumentException($"Relative uri {uri} without base url");
-            if (!baseUri.IsAbsoluteUri)
-                throw new ArgumentException($"Base uri {baseUri} is relative");
-            if (baseUri.Scheme == "resm")
-                throw new ArgumentException(
-                    $"Relative uris for 'resm' scheme aren't supported; {baseUri} uses resm");
-            return new Uri(baseUri, uri);
-        }
         
         private IAssetDescriptor? GetAsset(Uri uri, Uri? baseUri)
         {           
-            if (uri.IsAbsoluteUri && uri.Scheme == "resm")
+            if (uri.IsAbsoluteResm())
             {
                 var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultResmAssembly;
 
@@ -172,9 +168,9 @@ namespace Avalonia.PlatformSupport
                 return rv;
             }
 
-            uri = EnsureAbsolute(uri, baseUri);
+            uri = uri.EnsureAbsolute(baseUri);
 
-            if (uri.Scheme == "avares")
+            if (uri.IsAvares())
             {
                 var (asm, path) = GetResAsmAndPath(uri);
                 if (asm.AvaloniaResources == null)
@@ -188,8 +184,8 @@ namespace Avalonia.PlatformSupport
 
         private (AssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
         {
-            var asm = GetAssembly(uri.Authority);
-            return (asm, uri.AbsolutePath);
+            var asm = s_assemblyDescriptorResolver.GetAssembly(uri.Authority);
+            return (asm, uri.GetUnescapeAbsolutePath());
         }
         
         private AssemblyDescriptor? GetAssembly(Uri? uri)
@@ -198,197 +194,20 @@ namespace Avalonia.PlatformSupport
             {
                 if (!uri.IsAbsoluteUri)
                     return null;
-                if (uri.Scheme == "avares")
+                if (uri.IsAvares())
                     return GetResAsmAndPath(uri).asm;
 
-                if (uri.Scheme == "resm")
+                if (uri.IsResm())
                 {
-                    var qs = ParseQueryString(uri);
-
-                    if (qs.TryGetValue("assembly", out var assemblyName))
-                    {
-                        return GetAssembly(assemblyName);
-                    }
+                    var assemblyName = uri.GetAssemblyNameFromQuery();
+                    if (assemblyName.Length > 0)
+                        return s_assemblyDescriptorResolver.GetAssembly(assemblyName);
                 }
             }
 
             return null;
         }
 
-        private AssemblyDescriptor GetAssembly(string name)
-        {
-            if (name == null)
-                throw new ArgumentNullException(nameof(name));
-
-            if (!AssemblyNameCache.TryGetValue(name, out var rv))
-            {
-                var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-                var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
-                if (match != null)
-                {
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(match);
-                }
-                else
-                {
-                    // iOS does not support loading assemblies dynamically!
-#if NET6_0_OR_GREATER
-                    if (OperatingSystem.IsIOS())
-                    {
-                        throw new InvalidOperationException(
-                            $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
-                    }
-#endif
-                    name = Uri.UnescapeDataString(name);
-                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
-                }
-            }
-
-            return rv;
-        }
-
-        private Dictionary<string, string> ParseQueryString(Uri uri)
-        {
-            return uri.Query.TrimStart('?')
-                .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(p => p.Split('='))
-                .ToDictionary(p => p[0], p => p[1]);
-        }
-
-        private interface IAssetDescriptor
-        {
-            Stream GetStream();
-            Assembly Assembly { get; }
-        }
-
-        private class AssemblyResourceDescriptor : IAssetDescriptor
-        {
-            private readonly Assembly _asm;
-            private readonly string _name;
-
-            public AssemblyResourceDescriptor(Assembly asm, string name)
-            {
-                _asm = asm;
-                _name = name;
-            }
-
-            public Stream GetStream()
-            {
-                var s = _asm.GetManifestResourceStream(_name);
-                return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
-            }
-
-            public Assembly Assembly => _asm;
-        }
-        
-        private class AvaloniaResourceDescriptor : IAssetDescriptor
-        {
-            private readonly int _offset;
-            private readonly int _length;
-            public Assembly Assembly { get; }
-
-            public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
-            {
-                _offset = offset;
-                _length = length;
-                Assembly = asm;
-            }
-            
-            public Stream GetStream()
-            {
-                var s = Assembly.GetManifestResourceStream(AvaloniaResourceName) ??
-                    throw new InvalidOperationException($"Could not find manifest resource stream '{AvaloniaResourceName}',");
-                return new SlicedStream(s, _offset, _length);
-            }
-        }
-        
-        class SlicedStream : Stream
-        {
-            private readonly Stream _baseStream;
-            private readonly int _from;
-
-            public SlicedStream(Stream baseStream, int from, int length)
-            {
-                Length = length;
-                _baseStream = baseStream;
-                _from = from;
-                _baseStream.Position = from;
-            }
-            public override void Flush()
-            {
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                if (origin == SeekOrigin.Begin)
-                    Position = offset;
-                if (origin == SeekOrigin.End)
-                    Position = _from + Length + offset;
-                if (origin == SeekOrigin.Current)
-                    Position = Position + offset;
-                return Position;
-            }
-
-            public override void SetLength(long value) => throw new NotSupportedException();
-
-            public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
-
-            public override bool CanRead => true;
-            public override bool CanSeek => _baseStream.CanRead;
-            public override bool CanWrite => false;
-            public override long Length { get; }
-            public override long Position
-            {
-                get => _baseStream.Position - _from;
-                set => _baseStream.Position = value + _from;
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (disposing)
-                    _baseStream.Dispose();
-            }
-
-            public override void Close() => _baseStream.Close();
-        }
-
-        private class AssemblyDescriptor
-        {
-            public AssemblyDescriptor(Assembly assembly)
-            {
-                Assembly = assembly;
-
-                if (assembly != null)
-                {
-                    Resources = assembly.GetManifestResourceNames()
-                        .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
-                    Name = assembly.GetName().Name;
-                    using (var resources = assembly.GetManifestResourceStream(AvaloniaResourceName))
-                    {
-                        if (resources != null)
-                        {
-                            Resources.Remove(AvaloniaResourceName);
-
-                            var indexLength = new BinaryReader(resources).ReadInt32();
-                            var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
-                            var baseOffset = indexLength + 4;
-                            AvaloniaResources = index.ToDictionary(r => "/" + r.Path!.TrimStart('/'), r => (IAssetDescriptor)
-                                new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
-                        }
-                    }
-                }
-            }
-
-            public Assembly Assembly { get; }
-            public Dictionary<string, IAssetDescriptor>? Resources { get; }
-            public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
-            public string? Name { get; }
-        }
-        
         public static void RegisterResUriParsers()
         {
             if (!UriParser.IsKnownScheme("avares"))
diff --git a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj b/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
index e08dc5e194..420ac0796c 100644
--- a/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
+++ b/src/Avalonia.PlatformSupport/Avalonia.PlatformSupport.csproj
@@ -16,4 +16,9 @@
   <Import Project="..\..\build\NetCore.props" />
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\NullableEnable.props" />
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="$(AssemblyName).UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87" />
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptor.cs b/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptor.cs
new file mode 100644
index 0000000000..a3de7f2b8a
--- /dev/null
+++ b/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptor.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Utilities;
+
+namespace Avalonia.PlatformSupport.Internal;
+
+internal class AssemblyDescriptor
+{
+    public AssemblyDescriptor(Assembly assembly)
+    {
+        Assembly = assembly;
+
+        if (assembly != null)
+        {
+            Resources = assembly.GetManifestResourceNames()
+                .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
+            Name = assembly.GetName().Name;
+            using (var resources = assembly.GetManifestResourceStream(Constants.AvaloniaResourceName))
+            {
+                if (resources != null)
+                {
+                    Resources.Remove(Constants.AvaloniaResourceName);
+
+                    var indexLength = new BinaryReader(resources).ReadInt32();
+                    var index = AvaloniaResourcesIndexReaderWriter.Read(new SlicedStream(resources, 4, indexLength));
+                    var baseOffset = indexLength + 4;
+                    AvaloniaResources = index.ToDictionary(r => GetPathRooted(r), r => (IAssetDescriptor)
+                        new AvaloniaResourceDescriptor(assembly, baseOffset + r.Offset, r.Size));
+                }
+            }
+        }
+    }
+
+    public Assembly Assembly { get; }
+    public Dictionary<string, IAssetDescriptor>? Resources { get; }
+    public Dictionary<string, IAssetDescriptor>? AvaloniaResources { get; }
+    public string? Name { get; }
+    private static string GetPathRooted(AvaloniaResourcesIndexEntry r) =>
+        r.Path![0] == '/' ? r.Path : '/' + r.Path;
+}
diff --git a/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptorResolver.cs b/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptorResolver.cs
new file mode 100644
index 0000000000..a78051a9c4
--- /dev/null
+++ b/src/Avalonia.PlatformSupport/Internal/AssemblyDescriptorResolver.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Avalonia.PlatformSupport.Internal;
+
+internal class AssemblyDescriptorResolver
+{
+    private readonly Dictionary<string, AssemblyDescriptor> _assemblyNameCache = new();
+
+    public AssemblyDescriptor GetAssembly(string name)
+    {
+        if (name == null)
+            throw new ArgumentNullException(nameof(name));
+
+        if (!_assemblyNameCache.TryGetValue(name, out var rv))
+        {
+            var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
+            if (match != null)
+            {
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(match);
+            }
+            else
+            {
+                // iOS does not support loading assemblies dynamically!
+#if NET6_0_OR_GREATER
+                if (OperatingSystem.IsIOS())
+                {
+                    throw new InvalidOperationException(
+                        $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
+                }
+#endif
+                name = Uri.UnescapeDataString(name);
+                _assemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
+            }
+        }
+
+        return rv;
+    }
+}
diff --git a/src/Avalonia.PlatformSupport/Internal/AssetDescriptor.cs b/src/Avalonia.PlatformSupport/Internal/AssetDescriptor.cs
new file mode 100644
index 0000000000..baae1f99e7
--- /dev/null
+++ b/src/Avalonia.PlatformSupport/Internal/AssetDescriptor.cs
@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Avalonia.PlatformSupport.Internal;
+
+internal interface IAssetDescriptor
+{
+    Stream GetStream();
+    Assembly Assembly { get; }
+}
+
+internal class AssemblyResourceDescriptor : IAssetDescriptor
+{
+    private readonly Assembly _asm;
+    private readonly string _name;
+
+    public AssemblyResourceDescriptor(Assembly asm, string name)
+    {
+        _asm = asm;
+        _name = name;
+    }
+
+    public Stream GetStream()
+    {
+        var s = _asm.GetManifestResourceStream(_name);
+        return s ?? throw new InvalidOperationException($"Could not find manifest resource stream '{_name}',");
+    }
+
+    public Assembly Assembly => _asm;
+}
+        
+internal class AvaloniaResourceDescriptor : IAssetDescriptor
+{
+    private readonly int _offset;
+    private readonly int _length;
+    public Assembly Assembly { get; }
+
+    public AvaloniaResourceDescriptor(Assembly asm, int offset, int length)
+    {
+        _offset = offset;
+        _length = length;
+        Assembly = asm;
+    }
+
+    public Stream GetStream()
+    {
+        var s = Assembly.GetManifestResourceStream(Constants.AvaloniaResourceName) ??
+                throw new InvalidOperationException($"Could not find manifest resource stream '{Constants.AvaloniaResourceName}',");
+        return new SlicedStream(s, _offset, _length);
+    }
+}
diff --git a/src/Avalonia.PlatformSupport/Internal/Constants.cs b/src/Avalonia.PlatformSupport/Internal/Constants.cs
new file mode 100644
index 0000000000..c8a0f7b1ce
--- /dev/null
+++ b/src/Avalonia.PlatformSupport/Internal/Constants.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.PlatformSupport.Internal;
+
+internal static class Constants
+{
+    public static string AvaloniaResourceName => "!AvaloniaResources";
+}
diff --git a/src/Avalonia.PlatformSupport/Internal/SlicedStream.cs b/src/Avalonia.PlatformSupport/Internal/SlicedStream.cs
new file mode 100644
index 0000000000..e310db964a
--- /dev/null
+++ b/src/Avalonia.PlatformSupport/Internal/SlicedStream.cs
@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+
+namespace Avalonia.PlatformSupport.Internal;
+
+internal class SlicedStream : Stream
+{
+    private readonly Stream _baseStream;
+    private readonly int _from;
+
+    public SlicedStream(Stream baseStream, int from, int length)
+    {
+        Length = length;
+        _baseStream = baseStream;
+        _from = from;
+        _baseStream.Position = from;
+    }
+    public override void Flush()
+    {
+    }
+
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        return _baseStream.Read(buffer, offset, (int)Math.Min(count, Length - Position));
+    }
+
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        if (origin == SeekOrigin.Begin)
+            Position = offset;
+        if (origin == SeekOrigin.End)
+            Position = _from + Length + offset;
+        if (origin == SeekOrigin.Current)
+            Position = Position + offset;
+        return Position;
+    }
+
+    public override void SetLength(long value) => throw new NotSupportedException();
+
+    public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+
+    public override bool CanRead => true;
+    public override bool CanSeek => _baseStream.CanRead;
+    public override bool CanWrite => false;
+    public override long Length { get; }
+    public override long Position
+    {
+        get => _baseStream.Position - _from;
+        set => _baseStream.Position = value + _from;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+            _baseStream.Dispose();
+    }
+
+    public override void Close() => _baseStream.Close();
+}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
index a54dad7623..365fb6e412 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media.Fonts
 {
@@ -12,18 +13,10 @@ namespace Avalonia.Media.Fonts
         /// </summary>
         /// <param name="fontFamilyKey"></param>
         /// <returns></returns>
-        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey)
-        {
-            var sourceWithoutArguments = fontFamilyKey.Source.OriginalString.Split('?').First();
-
-            if (sourceWithoutArguments.EndsWith(".ttf")
-                || sourceWithoutArguments.EndsWith(".otf"))
-            {
-                return GetFontAssetsByExpression(fontFamilyKey);
-            }
-
-            return GetFontAssetsBySource(fontFamilyKey);
-        }
+        public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey) =>
+            IsFontTtfOrOtf(fontFamilyKey.Source) ?
+                GetFontAssetsByExpression(fontFamilyKey) :
+                GetFontAssetsBySource(fontFamilyKey);
 
         /// <summary>
         /// Searches for font assets at a given location and returns a quantity of found assets
@@ -34,11 +27,7 @@ namespace Avalonia.Media.Fonts
         {
             var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
             var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
-
-            var matchingAssets =
-                availableAssets.Where(x => x.AbsolutePath.EndsWith(".ttf") || x.AbsolutePath.EndsWith(".otf"));
-
-            return matchingAssets;
+            return availableAssets.Where(x => IsFontTtfOrOtf(x));
         }
 
         /// <summary>
@@ -49,71 +38,124 @@ namespace Avalonia.Media.Fonts
         /// <returns></returns>
         private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
         {
+            var (fileNameWithoutExtension, extension) = GetFileName(fontFamilyKey, out var location);
+            var filePattern = CreateFilePattern(fontFamilyKey, location, fileNameWithoutExtension);
+
             var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
+            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
 
-            var fileName = GetFileName(fontFamilyKey, out var fileExtension, out var location);
+            return availableResources.Where(x => IsContainsFile(x, filePattern, extension));
+        }
 
-            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
+        private static (string fileNameWithoutExtension, string extension) GetFileName(
+            FontFamilyKey fontFamilyKey, out Uri location)
+        {
+            if (fontFamilyKey.Source.IsAbsoluteResm())
+            {
+                var fileName = GetFileNameAndExtension(fontFamilyKey.Source.GetUnescapeAbsolutePath(), '.');
+
+                var uriLocation = fontFamilyKey.Source.GetUnescapeAbsoluteUri()
+                    .Replace("." + fileName.fileNameWithoutExtension + fileName.extension, string.Empty);
+                location = new Uri(uriLocation, UriKind.RelativeOrAbsolute);
+
+                return fileName;
+            }
 
-            string compareTo;
+            var filename = GetFileNameAndExtension(fontFamilyKey.Source.OriginalString);
+            var fullFilename = filename.fileNameWithoutExtension + filename.extension;
 
-            if (fontFamilyKey.Source.IsAbsoluteUri)
+            if (fontFamilyKey.BaseUri != null)
             {
-                if (fontFamilyKey.Source.Scheme == "resm")
-                {
-                    compareTo = location.AbsolutePath + "." + fileName.Split('*').First();
-                }
-                else
-                {
-                    compareTo = location.AbsolutePath + fileName.Split('*').First();
-                }
+                var relativePath = fontFamilyKey.Source.OriginalString
+                    .Replace(fullFilename, string.Empty);
+
+                location = new Uri(fontFamilyKey.BaseUri, relativePath);
             }
             else
             {
-                compareTo = location.AbsolutePath + fileName.Split('*').First();
+                var uriString = fontFamilyKey.Source
+                    .GetUnescapeAbsoluteUri()
+                    .Replace(fullFilename, string.Empty);
+                location = new Uri(uriString);
             }
 
-            var matchingResources = availableResources.Where(
-                x => x.AbsolutePath.Contains(compareTo)
-                     && x.AbsolutePath.EndsWith(fileExtension));
+            return filename;
+        }
 
-            return matchingResources;
+        private static string CreateFilePattern(
+            FontFamilyKey fontFamilyKey, Uri location, string fileNameWithoutExtension)
+        {
+            var path = location.GetUnescapeAbsolutePath();
+            var file = GetSubString(fileNameWithoutExtension, '*');
+            return fontFamilyKey.Source.IsAbsoluteResm()
+                ? path + "." + file
+                : path + file;
         }
 
-        private static string GetFileName(FontFamilyKey fontFamilyKey, out string fileExtension, out Uri location)
+        private static bool IsContainsFile(Uri x, string filePattern, string fileExtension)
         {
-            if (fontFamilyKey.Source.IsAbsoluteUri && fontFamilyKey.Source.Scheme == "resm")
-            {
-                fileExtension = "." + fontFamilyKey.Source.AbsolutePath.Split('.').LastOrDefault();
+            var path = x.GetUnescapeAbsolutePath();
+            return path.IndexOf(filePattern, StringComparison.Ordinal) >= 0
+                   && path.EndsWith(fileExtension, StringComparison.Ordinal);
+        }
 
-                var fileName = fontFamilyKey.Source.LocalPath.Replace(fileExtension, string.Empty).Split('.').Last();
+        private static bool IsFontTtfOrOtf(Uri uri)
+        {
+            var sourceWithoutArguments = GetSubString(uri.OriginalString, '?');
+            return sourceWithoutArguments.EndsWith(".ttf", StringComparison.Ordinal)
+                   || sourceWithoutArguments.EndsWith(".otf", StringComparison.Ordinal);
+        }
 
-                location = new Uri(fontFamilyKey.Source.AbsoluteUri.Replace("." + fileName + fileExtension, string.Empty), UriKind.RelativeOrAbsolute);
+        private static (string fileNameWithoutExtension, string extension) GetFileNameAndExtension(
+            string path, char directorySeparator = '/')
+        {
+            var pathAsSpan = path.AsSpan();
+            pathAsSpan = IsPathRooted(pathAsSpan, directorySeparator) ?
+                pathAsSpan.Slice(1, path.Length - 1) :
+                pathAsSpan;
 
-                return fileName;
-            }
+            var extension = GetFileExtension(pathAsSpan);
+            if (extension.Length == pathAsSpan.Length)
+                return (extension.ToString(), string.Empty);
 
-            var pathSegments = fontFamilyKey.Source.OriginalString.Split('/');
+            var fileName = GetFileName(pathAsSpan, directorySeparator, extension.Length);
+            return (fileName.ToString(), extension.ToString());
+        }
 
-            var fileNameWithExtension = pathSegments.Last();
+        private static bool IsPathRooted(ReadOnlySpan<char> path, char directorySeparator) =>
+            path.Length > 0 && path[0] == directorySeparator;
 
-            var fileNameSegments = fileNameWithExtension.Split('.');
+        private static ReadOnlySpan<char> GetFileExtension(ReadOnlySpan<char> path)
+        {
+            for (var i = path.Length - 1; i > 0; --i)
+            {
+                if (path[i] == '.')
+                    return path.Slice(i, path.Length - i);
+            }
 
-            fileExtension = "." + fileNameSegments.Last();
+            return path;
+        }
 
-            if (fontFamilyKey.BaseUri != null)
+        private static ReadOnlySpan<char> GetFileName(ReadOnlySpan<char> path, char directorySeparator, int extensionLength)
+        {
+            for (var i = path.Length - extensionLength - 1; i >= 0; --i)
             {
-                var relativePath = fontFamilyKey.Source.OriginalString
-                    .Replace(fileNameWithExtension, string.Empty);
-
-                location = new Uri(fontFamilyKey.BaseUri, relativePath);
+                if (path[i] == directorySeparator)
+                    return path.Slice(i + 1, path.Length - i - extensionLength - 1);
             }
-            else
+
+            return path.Slice(0, path.Length - extensionLength);
+        }
+
+        private static string GetSubString(string path, char separator)
+        {
+            for (var i = 0; i < path.Length; i++)
             {
-                location = new Uri(fontFamilyKey.Source.AbsolutePath.Replace(fileNameWithExtension, string.Empty));
+                if (path[i] == separator)
+                    return path.Substring(0, i);
             }
 
-            return fileNameSegments.First();
+            return path;
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
new file mode 100644
index 0000000000..5c3ac6adeb
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
@@ -0,0 +1,29 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class UriExtensionsTests
+{
+    [Fact]
+    public void Assembly_Name_From_Query_Parsed()
+    {
+        const string key = "assembly";
+        const string value = "Avalonia.Themes.Default";
+
+        var uri = new Uri($"resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?{key}={value}");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(value, name);
+    }
+
+    [Fact]
+    public void Assembly_Name_From_Empty_Query_Not_Parsed()
+    {
+        var uri = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml");
+        var name = uri.GetAssemblyNameFromQuery();
+
+        Assert.Equal(string.Empty, name);
+    }
+}
diff --git a/tests/Avalonia.PlatformSupport.UnitTests/AssetLoaderTests.cs b/tests/Avalonia.PlatformSupport.UnitTests/AssetLoaderTests.cs
new file mode 100644
index 0000000000..f950fb7e99
--- /dev/null
+++ b/tests/Avalonia.PlatformSupport.UnitTests/AssetLoaderTests.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Reflection;
+using Avalonia.PlatformSupport.Internal;
+using Moq;
+using Xunit;
+
+namespace Avalonia.PlatformSupport.UnitTests;
+
+public class AssetLoaderTests
+{
+    public class MockAssembly : Assembly {}
+
+    private const string AssemblyNameWithWhitespace = "Awesome Library";
+
+    private const string AssemblyNameWithNonAscii = "Какое-то-название";
+
+    static AssetLoaderTests()
+    {
+        var resolver = Mock.Of<AssemblyDescriptorResolver>();
+
+        var descriptor = CreateAssemblyDescriptor(AssemblyNameWithWhitespace);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithWhitespace)).Returns(descriptor);
+
+        descriptor = CreateAssemblyDescriptor(AssemblyNameWithNonAscii);
+        Mock.Get(resolver).Setup(x => x.GetAssembly(AssemblyNameWithNonAscii)).Returns(descriptor);
+
+        AssetLoader.SetAssemblyDescriptorResolver(resolver);
+    }
+
+    [Fact]
+    public void AssemblyName_With_Whitespace_Should_Load_Resm()
+    {
+        var uri = new Uri($"resm:Avalonia.Base.UnitTests.Assets.something?assembly={AssemblyNameWithWhitespace}");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithWhitespace, assemblyActual?.FullName);
+    }
+
+    [Fact]
+    public void AssemblyName_With_Non_ASCII_Should_Load_Avares()
+    {
+        var uri = new Uri($"avares://{AssemblyNameWithNonAscii}/Assets/something");
+        var loader = new AssetLoader();
+
+        var assemblyActual = loader.GetAssembly(uri, null);
+
+        Assert.Equal(AssemblyNameWithNonAscii, assemblyActual?.FullName);
+    }
+
+    private static AssemblyDescriptor CreateAssemblyDescriptor(string assemblyName)
+    {
+        var assembly = Mock.Of<MockAssembly>();
+        Mock.Get(assembly).Setup(x => x.GetName()).Returns(new AssemblyName(assemblyName));
+        Mock.Get(assembly).Setup(x => x.FullName).Returns(assemblyName);
+
+        var descriptor = Mock.Of<AssemblyDescriptor>();
+        Mock.Get(descriptor).Setup(x => x.Assembly).Returns(assembly);
+        return descriptor;
+    }
+}
diff --git a/tests/Avalonia.PlatformSupport.UnitTests/Avalonia.PlatformSupport.UnitTests.csproj b/tests/Avalonia.PlatformSupport.UnitTests/Avalonia.PlatformSupport.UnitTests.csproj
new file mode 100644
index 0000000000..d714941e5a
--- /dev/null
+++ b/tests/Avalonia.PlatformSupport.UnitTests/Avalonia.PlatformSupport.UnitTests.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <OutputType>Library</OutputType>
+        <IsTestProject>true</IsTestProject>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+
+    <Import Project="..\..\build\UnitTests.NetCore.targets" />
+    <Import Project="..\..\build\UnitTests.NetFX.props" />
+    <Import Project="..\..\build\Moq.props" />
+    <Import Project="..\..\build\XUnit.props" />
+    <Import Project="..\..\build\Rx.props" />
+    <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
+    <Import Project="..\..\build\SharedVersion.props" />
+    <ItemGroup>
+      <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+      <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
+      <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/tests/Avalonia.UnitTests/MockAssetLoader.cs b/tests/Avalonia.UnitTests/MockAssetLoader.cs
index f591ac445f..6fe8cd54f7 100644
--- a/tests/Avalonia.UnitTests/MockAssetLoader.cs
+++ b/tests/Avalonia.UnitTests/MockAssetLoader.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.UnitTests
 {
@@ -39,7 +40,9 @@ namespace Avalonia.UnitTests
 
         public IEnumerable<Uri> GetAssets(Uri uri, Uri baseUri)
         {
-            return _assets.Keys.Where(x => x.AbsolutePath.Contains(uri.AbsolutePath));
+            var absPath = uri.GetUnescapeAbsolutePath();
+            return _assets.Keys.Where(
+                x => x.GetUnescapeAbsolutePath().IndexOf(absPath, StringComparison.Ordinal) >= 0);
         }
 
         public void SetDefaultAssembly(Assembly asm)
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
index a83c0562e7..7e1cc4cd96 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
@@ -12,24 +12,28 @@ namespace Avalonia.Visuals.UnitTests.Media.Fonts
 
     public class FontFamilyLoaderTests : IDisposable
     {
+        private const string AssetMyFontRegular = AssetLocation + ".MyFont Regular.ttf" + Assembly + FontName;
         private const string FontName = "#MyFont";
         private const string Assembly = "?assembly=Avalonia.Visuals.UnitTests";
         private const string AssetLocation = "resm:Avalonia.Visuals.UnitTests.Assets";
+        private const string AssetLocationAvares = "avares://Avalonia.Visuals.UnitTests";
+        private const string AssetYourFileName = "/Assets/YourFont.ttf";
+        private const string AssetYourFontAvares = AssetLocationAvares + AssetYourFileName;
 
         private readonly IDisposable _testApplication;
 
         public FontFamilyLoaderTests()
         {
-            const string AssetMyFontRegular = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
-            const string AssetMyFontBold = AssetLocation + ".MyFont-Bold.ttf" + Assembly + FontName;
+            const string AssetMyFontBold = AssetLocation + ".MyFont Bold.ttf" + Assembly + FontName;
             const string AssetYourFont = AssetLocation + ".YourFont.ttf" + Assembly + FontName;
 
             var fontAssets = new[]
-                                    {
-                                        (AssetMyFontRegular, "AssetData"),
-                                        (AssetMyFontBold, "AssetData"),
-                                        (AssetYourFont, "AssetData")
-                                    };
+            {
+                (AssetMyFontRegular, "AssetData"),
+                (AssetMyFontBold, "AssetData"),
+                (AssetYourFont, "AssetData"),
+                (AssetYourFontAvares, "AssetData")
+            };
 
             _testApplication = StartWithResources(fontAssets);
         }
@@ -42,10 +46,18 @@ namespace Avalonia.Visuals.UnitTests.Media.Fonts
         [Fact]
         public void Should_Load_Single_FontAsset()
         {
-            const string FontAsset = AssetLocation + ".MyFont-Regular.ttf" + Assembly + FontName;
+            var source = new Uri(AssetMyFontRegular, UriKind.RelativeOrAbsolute);
+            var key = new FontFamilyKey(source);
 
-            var source = new Uri(FontAsset, UriKind.RelativeOrAbsolute);
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
 
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Single_FontAsset_Avares_Without_BaseUri()
+        {
+            var source = new Uri(AssetYourFontAvares);
             var key = new FontFamilyKey(source);
 
             var fontAssets = FontFamilyLoader.LoadFontAssets(key);
@@ -54,10 +66,21 @@ namespace Avalonia.Visuals.UnitTests.Media.Fonts
         }
 
         [Fact]
-        public void Should_Load_Matching_Assets()
+        public void Should_Load_Single_FontAsset_Avares_With_BaseUri()
         {
-            var source = new Uri(AssetLocation + ".MyFont-*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
+            var source = new Uri(AssetYourFileName, UriKind.RelativeOrAbsolute);
+            var baseUri = new Uri(AssetLocationAvares);
+            var key = new FontFamilyKey(source, baseUri);
 
+            var fontAssets = FontFamilyLoader.LoadFontAssets(key);
+
+            Assert.Single(fontAssets);
+        }
+
+        [Fact]
+        public void Should_Load_Matching_Assets()
+        {
+            var source = new Uri(AssetLocation + ".MyFont*.ttf" + Assembly + FontName, UriKind.RelativeOrAbsolute);
             var key = new FontFamilyKey(source);
 
             var fontAssets = FontFamilyLoader.LoadFontAssets(key).ToArray();

From 9bb77030d98f777b04af0c27198049f8632a52c9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 18 Mar 2022 14:15:27 +0100
Subject: [PATCH 19/34] Measure overlay children to availableSize.

Fixes #7815,
---
 src/Avalonia.Controls/Primitives/OverlayLayer.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 6a0408d6d1..468879edd1 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -23,7 +23,14 @@ namespace Avalonia.Controls.Primitives
         }
 
         public bool HitTest(Point point) => Children.HitTestCustom(point);
-        
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            foreach (Control child in Children)
+                child.Measure(availableSize);
+            return availableSize;
+        }
+
         protected override Size ArrangeOverride(Size finalSize)
         {
             // We are saving it here since child controls might need to know the entire size of the overlay

From c656c4fff62f6cd9dd8fb3098c96cff6b611eceb Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Mar 2022 14:47:19 +0000
Subject: [PATCH 20/34] fix using touch for date/time pickers.

---
 .../DateTimePickers/DateTimePickerPanel.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index 5948d81810..cf032e1a00 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using Avalonia.Input;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -63,13 +64,14 @@ namespace Avalonia.Controls.Primitives
         public DateTimePickerPanel()
         {
             FormatDate = DateTime.Now;
-            AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
-            AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
         }
 
         static DateTimePickerPanel()
         {
             FocusableProperty.OverrideDefaultValue<DateTimePickerPanel>(true);
+            BackgroundProperty.OverrideDefaultValue<DateTimePickerPanel>(Brushes.Transparent);
             AffectsMeasure<DateTimePickerPanel>(ItemHeightProperty);
         }
 
@@ -529,7 +531,6 @@ namespace Avalonia.Controls.Primitives
                 e.Source is IVisual source)
             {
                 _pressedItem = GetItemFromSource(source);
-                e.Handled = true;
             }
         }
 
@@ -543,7 +544,6 @@ namespace Avalonia.Controls.Primitives
             {
                 SelectedValue = tag;
                 _pressedItem = null;
-                e.Handled = true;
             }
         }
 

From 86c68daa63468a6f789d24fe8558ce996f2168ae Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Mar 2022 15:54:24 +0000
Subject: [PATCH 21/34] use tapped gesture instead of pointer events in date
 time picker.

---
 .../DateTimePickers/DateTimePickerPanel.cs    | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index cf032e1a00..a923c44d05 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
@@ -59,13 +60,11 @@ namespace Avalonia.Controls.Primitives
         private Vector _offset;
         private bool _hasInit;
         private bool _suppressUpdateOffset;
-        private ListBoxItem? _pressedItem;
 
         public DateTimePickerPanel()
         {
             FormatDate = DateTime.Now;
-            AddHandler(PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
-            AddHandler(PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(TappedEvent, OnItemTapped, RoutingStrategies.Bubble);
         }
 
         static DateTimePickerPanel()
@@ -525,25 +524,14 @@ namespace Avalonia.Controls.Primitives
             return newValue;
         }
 
-        private void OnItemPointerDown(object? sender, PointerPressedEventArgs e)
+        private void OnItemTapped(object? sender, TappedEventArgs e)
         {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed &&
-                e.Source is IVisual source)
-            {
-                _pressedItem = GetItemFromSource(source);
-            }
-        }
-
-        private void OnItemPointerUp(object? sender, PointerReleasedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased &&
-                _pressedItem != null &&
-                e.Source is IVisual source &&
-                GetItemFromSource(source) is ListBoxItem item &&
-                item.Tag is int tag)
+            if (e.Source is IVisual source && 
+                GetItemFromSource(source) is ListBoxItem listBoxItem &&
+                listBoxItem.Tag is int tag)
             {
                 SelectedValue = tag;
-                _pressedItem = null;
+                e.Handled = true;
             }
         }
 

From 7794d1b046bd6a5fe9c0148413a9c01858cc6974 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 21 Mar 2022 00:11:08 -0400
Subject: [PATCH 22/34] Add tests

---
 .../AvaloniaObjectTests_Binding.cs            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 7c4c5c96a5..d4e14d00b8 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -829,6 +829,30 @@ namespace Avalonia.Base.UnitTests
             subscription.Dispose();
         }
 
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { Value = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding(nameof(source.Value), BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.SetterCalled);
+        }
+
+        [Fact]
+        public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation_Indexer_With_Value()
+        {
+            var target = new Class1();
+            var source = new TestTwoWayBindingViewModel() { [0] = 1 };
+            source.ResetSetterCalled();
+
+            target.Bind(Class1.DoubleValueProperty, new Binding("[0]", BindingMode.TwoWay) { Source = source });
+
+            Assert.False(source.SetterCalled);
+        }
+
         /// <summary>
         /// Returns an observable that returns a single value but does not complete.
         /// </summary>
@@ -943,6 +967,11 @@ namespace Avalonia.Base.UnitTests
             }
 
             public bool SetterCalled { get; private set; }
+
+            public void ResetSetterCalled()
+            {
+                SetterCalled = false;
+            }
         }
     }
 }

From 6a5bd396cbecf8ed5e8a07cc8827334384e338b4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 21 Mar 2022 00:18:52 -0400
Subject: [PATCH 23/34] Rename fields

---
 src/Avalonia.Base/Data/BindingOperations.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 0c38f78c83..4e47a720f0 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -99,14 +99,15 @@ namespace Avalonia.Data
 
         private sealed class TwoWayBindingDisposable : IDisposable
         {
-            private readonly IDisposable _first;
-            private readonly IDisposable _second;
+            private readonly IDisposable _toTargetSubscription;
+            private readonly IDisposable _fromTargetSubsription;
+
             private bool _isDisposed;
 
-            public TwoWayBindingDisposable(IDisposable first, IDisposable second)
+            public TwoWayBindingDisposable(IDisposable toTargetSubscription, IDisposable fromTargetSubsription)
             {
-                _first = first;
-                _second = second;
+                _toTargetSubscription = toTargetSubscription;
+                _fromTargetSubsription = fromTargetSubsription;
             }
 
             public void Dispose()
@@ -116,8 +117,8 @@ namespace Avalonia.Data
                     return;
                 }
 
-                _second.Dispose();
-                _first.Dispose();
+                _fromTargetSubsription.Dispose();
+                _toTargetSubscription.Dispose();
 
                 _isDisposed = true;
             }

From 928a048e9cb12b4fa8abfb46654eb0b07ea450b7 Mon Sep 17 00:00:00 2001
From: Trym Lund Flogard <trym@flogard.no>
Date: Tue, 22 Mar 2022 12:30:27 +0100
Subject: [PATCH 24/34] Fix ToggleSwitchFillOffDisabled resource key typo

---
 src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml | 2 +-
 src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
index 305f1b1814..2c831cf360 100644
--- a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
@@ -254,7 +254,7 @@
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index a9e6569158..a2b50a859d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -220,7 +220,7 @@
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">

From 61264825b8812ccac75e24c4c56e2c71bb1fad05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= <darek.komosinski@gmail.com>
Date: Tue, 22 Mar 2022 21:46:43 +0100
Subject: [PATCH 25/34] Change ProgressBar Value binding mode to OneWay by
 default.

---
 src/Avalonia.Controls/ProgressBar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 017a053c48..1d8d6aef45 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Layout;
 using Avalonia.Media;
 
@@ -137,6 +138,7 @@ namespace Avalonia.Controls
 
         static ProgressBar()
         {
+            ValueProperty.OverrideMetadata<ProgressBar>(new DirectPropertyMetadata<double>(defaultBindingMode: BindingMode.OneWay));
             ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));

From 6a1e7b25a75e312e1a93d3a0192382eaca9ddd38 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:26:25 -0400
Subject: [PATCH 26/34] Implement TemplatePartAttribute from WPF

---
 .../Metadata/PseudoClassesAttribute.cs        | 13 +++++
 .../Metadata/TemplatePartAttribute.cs         | 55 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 src/Avalonia.Styling/Controls/Metadata/TemplatePartAttribute.cs

diff --git a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
index 0060767565..30e8661e89 100644
--- a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
+++ b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
@@ -5,14 +5,27 @@ using System.Collections.Generic;
 
 namespace Avalonia.Controls.Metadata
 {
+    /// <summary>
+    /// Defines all pseudoclasses by name referenced and implemented by a control.
+    /// </summary>
+    /// <remarks>
+    /// This is currently used for code-completion in certain IDEs.
+    /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public sealed class PseudoClassesAttribute : Attribute
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PseudoClassesAttribute"/> class.
+        /// </summary>
+        /// <param name="pseudoClasses">The list of pseudoclass names.</param>
         public PseudoClassesAttribute(params string[] pseudoClasses)
         {
             PseudoClasses = pseudoClasses;
         }
 
+        /// <summary>
+        /// Gets the list of pseudoclass names.
+        /// </summary>
         public IReadOnlyList<string> PseudoClasses { get; }
     }
 }
diff --git a/src/Avalonia.Styling/Controls/Metadata/TemplatePartAttribute.cs b/src/Avalonia.Styling/Controls/Metadata/TemplatePartAttribute.cs
new file mode 100644
index 0000000000..3b8f971713
--- /dev/null
+++ b/src/Avalonia.Styling/Controls/Metadata/TemplatePartAttribute.cs
@@ -0,0 +1,55 @@
+// This source file is adapted from the Windows Presentation Foundation project. 
+// (https://github.com/dotnet/wpf/) 
+// 
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System;
+
+#nullable enable
+
+namespace Avalonia.Controls.Metadata
+{
+    /// <summary>
+    /// Defines a control template part referenced by name in code.
+    /// Template part names should begin with the "PART_" prefix.
+    /// </summary>
+    /// <remarks>
+    /// Style authors should be able to identify the part type used for styling the specific control.
+    /// The part is usually required in the style and should have a specific predefined name.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class TemplatePartAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        public TemplatePartAttribute()
+        {
+            Name = string.Empty;
+            Type = typeof(object);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatePartAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The part name used by the class to identify a required element in the style.</param>
+        /// <param name="type">The type of the element that should be used as a part with name.</param>
+        public TemplatePartAttribute(string name, Type type)
+        {
+            Name = name;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Gets or sets the part name used by the class to identify a required element in the style.
+        /// Template part names should begin with the "PART_" prefix.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the element that should be used as a part with name specified
+        /// in <see cref="Name"/>.
+        /// </summary>
+        public Type Type { get; set; }
+    }
+}

From 9670acd709c6e23bd1b24f1d9fefbe52cc7d2dec Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 2 Sep 2021 12:07:25 +0200
Subject: [PATCH 27/34] fixes(OSX): convertBaseToScreen:' is deprecated: first
 deprecated in macOS 10.7

---
 native/Avalonia.Native/src/OSX/window.mm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 9b703c4838..620b750a40 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -457,7 +457,8 @@ public:
             }
             
             point = ConvertPointY(point);
-            auto viewPoint = [Window convertScreenToBase:ToNSPoint(point)];
+            NSRect convertRect = [Window convertRectToScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+            auto viewPoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);
             
             *ret = [View translateLocalPoint:ToAvnPoint(viewPoint)];
             
@@ -477,7 +478,8 @@ public:
             }
             
             auto cocoaViewPoint =  ToNSPoint([View translateLocalPoint:point]);
-            auto cocoaScreenPoint = [Window convertBaseToScreen:cocoaViewPoint];
+            NSRect convertRect = [Window convertRectToScreen:NSMakeRect(cocoaViewPoint.x, cocoaViewPoint.y, 0.0, 0.0)];
+            auto cocoaScreenPoint = NSPointFromCGPoint(NSMakePoint(convertRect.origin.x, convertRect.origin.y));
             *ret = ConvertPointY(ToAvnPoint(cocoaScreenPoint));
             
             return S_OK;
@@ -573,7 +575,8 @@ public:
         if(!((nseventType >= NSEventTypeLeftMouseDown && nseventType <= NSEventTypeMouseExited)
            || (nseventType >= NSEventTypeOtherMouseDown && nseventType <= NSEventTypeOtherMouseDragged)))
         {
-            auto nspoint = [Window convertBaseToScreen: ToNSPoint(point)];
+            NSRect convertRect = [Window convertRectToScreen:NSMakeRect(point.X, point.Y, 0.0, 0.0)];
+            auto nspoint = NSMakePoint(convertRect.origin.x, convertRect.origin.y);            
             CGPoint cgpoint = NSPointToCGPoint(nspoint);
             auto cgevent = CGEventCreateMouseEvent(NULL, kCGEventLeftMouseDown, cgpoint, kCGMouseButtonLeft);
             nsevent = [NSEvent eventWithCGEvent: cgevent];

From bdb75b971519efe57f29b0ef94f7e1b9c4d5f5e1 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 2 Sep 2021 15:03:55 +0200
Subject: [PATCH 28/34] fixes(OSX): Suppress expression result unused.

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

diff --git a/native/Avalonia.Native/src/OSX/controlhost.mm b/native/Avalonia.Native/src/OSX/controlhost.mm
index f8e9a3b6d1..5683a5a975 100644
--- a/native/Avalonia.Native/src/OSX/controlhost.mm
+++ b/native/Avalonia.Native/src/OSX/controlhost.mm
@@ -36,7 +36,10 @@ public:
     virtual void DestroyDefaultChild(void* child) override
     {
         // ARC will release the object for us
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wunused-value"
         (__bridge_transfer NSView*) child;
+        #pragma clang diagnostic pop
     }
 };
 

From e8960f8235d646992fe5a3f1a041c8374fcfd3c8 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:14:30 -0400
Subject: [PATCH 29/34] Fix PathIcon style ordering

---
 src/Avalonia.Themes.Default/DefaultTheme.xaml           | 4 ++--
 src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 6d2af1de57..846d45b839 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -3,8 +3,9 @@
         x:Class="Avalonia.Themes.Default.DefaultTheme">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml"/>
+  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml"/>
-
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
@@ -22,7 +23,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 16a6cc9c14..2b7c07782b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -3,6 +3,8 @@
         x:Class="Avalonia.Themes.Fluent.Controls.FluentControls">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
+  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml"/>
@@ -21,7 +23,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml"/>

From 82c7d7d64f91a485fb05ab0396d53caf9556f72a Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Wed, 23 Mar 2022 20:38:24 +0000
Subject: [PATCH 30/34] Include Platform Handle in surface array (#7841)

 Include Platform Handle in surface array
---
 .../InvalidationAwareSurfaceView.cs           | 16 +++++++++---
 .../Platform/SkiaPlatform/TopLevelImpl.cs     | 11 +++-----
 .../Platform/IPlatformNativeSurfaceHandle.cs  | 10 +++++++
 src/Avalonia.X11/X11Window.cs                 | 26 ++++++++++++++++---
 src/Windows/Avalonia.Win32/WindowImpl.cs      |  8 ++++--
 5 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs

diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 34784612f1..5343b57251 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,18 +2,22 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
+using Android.Runtime;
 using Android.Util;
 using Android.Views;
+using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformHandle
+    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
     {
         bool _invalidateQueued;
         readonly object _lock = new object();
         private readonly Handler _handler;
-   
+
+        IntPtr IPlatformHandle.Handle =>
+            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, Holder.Surface.Handle);
 
         public InvalidationAwareSurfaceView(Context context) : base(context)
         {
@@ -25,7 +29,7 @@ namespace Avalonia.Android
         {
             lock (_lock)
             {
-                if(_invalidateQueued)
+                if (_invalidateQueued)
                     return;
                 _handler.Post(() =>
                 {
@@ -70,7 +74,7 @@ namespace Avalonia.Android
         public void SurfaceDestroyed(ISurfaceHolder holder)
         {
             Log.Info("AVALONIA", "Surface Destroyed");
-            
+
         }
 
         protected void DoDraw()
@@ -83,5 +87,9 @@ namespace Avalonia.Android
         }
         protected abstract void Draw();
         public string HandleDescriptor => "SurfaceView";
+
+        public PixelSize Size => new PixelSize(Holder.SurfaceFrame.Width(), Holder.SurfaceFrame.Height());
+
+        public double Scaling => Resources.DisplayMetrics.Density;
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 0afb1db141..8a475676a5 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using Android.Content;
 using Android.Graphics;
-using Android.Runtime;
 using Android.Views;
 using Android.Views.InputMethods;
 using Avalonia.Android.OpenGL;
@@ -38,11 +37,10 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             _keyboardHelper = new AndroidKeyboardEventsHelper<TopLevelImpl>(this);
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 GetAvaloniaPointFromEvent);
-
             _gl = GlPlatformSurface.TryCreate(this);
             _framebuffer = new FramebufferManager(this);
 
-            RenderScaling = (int)_view.Resources.DisplayMetrics.Density;
+            RenderScaling = (int)_view.Scaling;
 
             MaxClientSize = new PixelSize(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
@@ -77,7 +75,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public IPlatformHandle Handle => _view;
 
-        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer, Handle };
 
         public IRenderer CreateRenderer(IRenderRoot root) =>
             AndroidPlatform.Options.UseDeferredRendering
@@ -216,10 +214,9 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
 
-        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle =>
-            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, _view.Holder.Surface.Handle);
+        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle => ((IPlatformHandle)_view).Handle;
 
-        public PixelSize Size => new PixelSize(_view.Holder.SurfaceFrame.Width(), _view.Holder.SurfaceFrame.Height());
+        public PixelSize Size => _view.Size;
 
         public double Scaling => RenderScaling;
 
diff --git a/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
new file mode 100644
index 0000000000..264f5e4667
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IPlatformNativeSurfaceHandle.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Avalonia.Platform
+{
+    public interface IPlatformNativeSurfaceHandle : IPlatformHandle
+    {
+        PixelSize Size { get; }
+        double Scaling { get; }
+    }
+}
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 520b35dd03..066156a652 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -134,8 +134,8 @@ namespace Avalonia.X11
                                        SetWindowValuemask.WinGravity | SetWindowValuemask.BackingStore)), ref attr);
             else
                 _renderHandle = _handle;
-                
-            Handle = new PlatformHandle(_handle, "XID");
+
+            Handle = new SurfacePlatformHandle(this);
             _realSize = new PixelSize(defaultWidth, defaultHeight);
             platform.Windows[_handle] = OnEvent;
             XEventMask ignoredMask = XEventMask.SubstructureRedirectMask
@@ -169,7 +169,9 @@ namespace Avalonia.X11
             if (glx != null)
                 surfaces.Insert(0, new GlxGlPlatformSurface(glx.Display, glx.DeferredContext,
                     new SurfaceInfo(this, _x11.Display, _handle, _renderHandle)));
-            
+
+            surfaces.Add(Handle);
+
             Surfaces = surfaces.ToArray();
             UpdateMotifHints();
             UpdateSizeHints(null);
@@ -1142,5 +1144,23 @@ namespace Avalonia.X11
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
 
         public bool NeedsManagedDecorations => false;
+
+
+        public class SurfacePlatformHandle : IPlatformNativeSurfaceHandle
+        {
+            private readonly X11Window _owner;
+
+            public PixelSize Size => _owner.ToPixelSize(_owner.ClientSize);
+
+            public double Scaling => _owner.RenderScaling;
+
+            public SurfacePlatformHandle(X11Window owner)
+            {
+                _owner = owner;
+            }
+
+            public IntPtr Handle => _owner._renderHandle;
+            public string? HandleDescriptor => "XID";
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 41269ee7ca..f0036236ec 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -459,7 +459,7 @@ namespace Avalonia.Win32
             }
         }
 
-        public IEnumerable<object> Surfaces => new object[] { Handle, _gl, _framebuffer };
+        public IEnumerable<object> Surfaces => new object[] { (IPlatformNativeSurfaceHandle)Handle, _gl, _framebuffer };
 
         public PixelPoint Position
         {
@@ -1383,12 +1383,16 @@ namespace Avalonia.Win32
 
         public ITextInputMethodImpl TextInputMethod => Imm32InputMethod.Current;
 
-        private class WindowImplPlatformHandle : IPlatformHandle
+        private class WindowImplPlatformHandle : IPlatformNativeSurfaceHandle
         {
             private readonly WindowImpl _owner;
             public WindowImplPlatformHandle(WindowImpl owner) => _owner = owner;
             public IntPtr Handle => _owner.Hwnd;
             public string HandleDescriptor => PlatformConstants.WindowHandleType;
+
+            public PixelSize Size => PixelSize.FromSize(_owner.ClientSize, Scaling);
+
+            public double Scaling => _owner.RenderScaling;
         }
     }
 }

From 9b8d78e66a4338394a5143bf860520c89e355cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= <darek.komosinski@gmail.com>
Date: Wed, 23 Mar 2022 22:54:56 +0100
Subject: [PATCH 31/34] Add support for property navigation from setter
 directly.

---
 src/Avalonia.Base/StyledPropertyBase.cs       | 10 +---
 .../ViewModels/BindingSetterViewModel.cs      |  5 ++
 .../ViewModels/ControlDetailsViewModel.cs     | 43 +++++++++++------
 .../ViewModels/ResourceSetterViewModel.cs     |  3 ++
 .../Diagnostics/Views/ControlDetailsView.xaml | 48 ++++++++++++-------
 .../Views/ControlDetailsView.xaml.cs          | 24 ++++++++++
 6 files changed, 93 insertions(+), 40 deletions(-)

diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index 16ba571a5a..535a826c1e 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -159,9 +159,9 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
         {
-            vistor.Visit(this, ref data);
+            visitor.Visit(this, ref data);
         }
 
         /// <summary>
@@ -242,11 +242,5 @@ namespace Avalonia
             _ = type ?? throw new ArgumentNullException(nameof(type));
             return GetMetadata(type).DefaultValue;
         }
-
-        [DebuggerHidden]
-        private Func<IAvaloniaObject, TValue, TValue> Cast<THost>(Func<THost, TValue, TValue> validate)
-        {
-            return (o, v) => validate((THost)o, v);
-        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
index de3e56e514..16973a96ef 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -14,11 +14,13 @@ namespace Avalonia.Diagnostics.ViewModels
                 case Binding binding:
                     Path = binding.Path;
                     Tint = Brushes.CornflowerBlue;
+                    ValueTypeTooltip = "Reflection Binding";
 
                     break;
                 case CompiledBindingExtension binding:
                     Path = binding.Path.ToString();
                     Tint = Brushes.DarkGreen;
+                    ValueTypeTooltip = "Compiled Binding";
 
                     break;
                 case TemplateBinding binding:
@@ -32,6 +34,7 @@ namespace Avalonia.Diagnostics.ViewModels
                     }
 
                     Tint = Brushes.OrangeRed;
+                    ValueTypeTooltip = "Template Binding";
 
                     break;
                 default:
@@ -40,6 +43,8 @@ namespace Avalonia.Diagnostics.ViewModels
         }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public string Path { get; }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 701947d2ab..a1fd8ed028 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -155,31 +155,19 @@ namespace Avalonia.Diagnostics.ViewModels
         public object? SelectedEntity
         {
             get => _selectedEntity;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntity, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntity, value);
         }
 
         public string? SelectedEntityName
         {
             get => _selectedEntityName;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityName, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityName, value);
         }
         
         public string? SelectedEntityType
         {
             get => _selectedEntityType;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityType, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityType, value);
         }
         
         public PropertyViewModel? SelectedProperty
@@ -502,6 +490,31 @@ namespace Avalonia.Diagnostics.ViewModels
                 inpc2.PropertyChanged += ControlPropertyChanged;
             }
         }
+        
+        internal void SelectProperty(AvaloniaProperty property)
+        {
+            SelectedProperty = null;
+
+            if (SelectedEntity != _avaloniaObject)
+            {
+                NavigateToProperty(_avaloniaObject, (_avaloniaObject as IControl)?.Name ?? _avaloniaObject.ToString());    
+            }
+            
+            if (PropertiesView is null)
+            {
+                return;
+            }
+
+            foreach (object o in PropertiesView)
+            {
+                if (o is AvaloniaPropertyViewModel propertyVm && propertyVm.Property == property)
+                {
+                    SelectedProperty = propertyVm;
+                    
+                    break;
+                }
+            }
+        }
 
         internal void UpdatePropertiesView(bool showImplementedInterfaces)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
index e93dc7361b..5202ac963e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
@@ -7,11 +7,14 @@ namespace Avalonia.Diagnostics.ViewModels
         public object Key { get; }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
         {
             Key = resourceKey;
             Tint = isDynamic ? Brushes.Orange : Brushes.Brown;
+            ValueTypeTooltip = isDynamic ? "Dynamic Resource" : "Static Resource";
         }
 
         public void CopyResourceKey()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index ec97b213a9..8280c4fe2f 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -44,7 +44,9 @@
                               UseWholeWordFilter="{Binding UseWholeWordFilter}"
                               UseRegexFilter="{Binding UseRegexFilter}"/>
       
-      <DataGrid Items="{Binding PropertiesView}"
+      <DataGrid 
+                x:Name="DataGrid"
+                Items="{Binding PropertiesView}"
                 Grid.Row="2"
                 BorderThickness="0"
                 RowBackground="Transparent"
@@ -129,6 +131,18 @@
                     </Expander.Header>
 
                     <ItemsControl Margin="20,0,0,0" Grid.Row="1" Items="{Binding Setters}">
+                      
+                      <ItemsControl.Styles>
+                        <Style Selector="TextBlock.property-name">
+                          <Setter Property="FontWeight" Value="SemiBold" />
+                          <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                        
+                        <Style Selector="TextBlock.property-name:pointerover">
+                          <Setter Property="TextDecorations" Value="Underline" />
+                        </Style>
+                      </ItemsControl.Styles>
+                      
                       <ItemsControl.DataTemplates>
 
                         <DataTemplate DataType="IBrush">
@@ -138,6 +152,17 @@
                           </StackPanel>
                         </DataTemplate>
 
+                        <DataTemplate DataType="Color">
+                          <StackPanel Orientation="Horizontal" Spacing="2">
+                            <Border BorderThickness="1" BorderBrush="Black" Width="8" Height="8">
+                              <Border.Background>
+                                <SolidColorBrush Color="{Binding}" />
+                              </Border.Background>
+                            </Border>
+                            <TextBlock Text="{Binding}" />
+                          </StackPanel>
+                        </DataTemplate>
+                        
                         <DataTemplate DataType="vm:BindingSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
                             <Panel.ContextMenu>
@@ -147,10 +172,10 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <TextBlock>{</TextBlock>
-                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock Text="{Binding Path}" />
                               <TextBlock>}</TextBlock>
                             </StackPanel>
@@ -158,17 +183,6 @@
                           </Panel>
                         </DataTemplate>
 
-                        <DataTemplate DataType="Color">
-                          <StackPanel Orientation="Horizontal" Spacing="2">
-                            <Border BorderThickness="1" BorderBrush="Black" Width="8" Height="8">
-                              <Border.Background>
-                                <SolidColorBrush Color="{Binding}" />
-                              </Border.Background>
-                            </Border>
-                            <TextBlock Text="{Binding}" />
-                          </StackPanel>
-                        </DataTemplate>
-
                         <DataTemplate DataType="vm:ResourceSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
                             <Panel.ContextMenu>
@@ -179,11 +193,11 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Left">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                               <TextBlock>(</TextBlock>
-                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
@@ -200,7 +214,7 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index 78919a2105..08ffe2c081 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -7,9 +7,13 @@ namespace Avalonia.Diagnostics.Views
 {
     internal class ControlDetailsView : UserControl
     {
+        private DataGrid _dataGrid;
+
         public ControlDetailsView()
         {
             InitializeComponent();
+
+            _dataGrid = this.GetControl<DataGrid>("DataGrid");
         }
 
         private void InitializeComponent()
@@ -25,5 +29,25 @@ namespace Avalonia.Diagnostics.Views
             }
             
         }
+
+        private void PropertyNamePressed(object sender, PointerPressedEventArgs e)
+        {
+            var mainVm = (ControlDetailsViewModel?) DataContext;
+
+            if (mainVm is null)
+            {
+                return;
+            }
+            
+            if (sender is Control control && control.DataContext is SetterViewModel setterVm)
+            {
+                mainVm.SelectProperty(setterVm.Property);
+
+                if (mainVm.SelectedProperty is not null)
+                {
+                    _dataGrid.ScrollIntoView(mainVm.SelectedProperty, null);   
+                }
+            }
+        }
     }
 }

From b18cb5cac5b80981847acc75cc53c0914ba2bcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= <darek.komosinski@gmail.com>
Date: Wed, 23 Mar 2022 23:14:36 +0100
Subject: [PATCH 32/34] Improve hit testing of inactive property names.

---
 .../Diagnostics/Views/ControlDetailsView.xaml      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 8280c4fe2f..cc392853be 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -141,6 +141,14 @@
                         <Style Selector="TextBlock.property-name:pointerover">
                           <Setter Property="TextDecorations" Value="Underline" />
                         </Style>
+                        
+                        <Style Selector="Rectangle.property-inactive">
+                          <Setter Property="IsHitTestVisible" Value="False" />
+                          <Setter Property="Height" Value="1" />
+                          <Setter Property="Fill" Value="#6C6C6C" />
+                          <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        
                       </ItemsControl.Styles>
                       
                       <ItemsControl.DataTemplates>
@@ -179,7 +187,7 @@
                               <TextBlock Text="{Binding Path}" />
                               <TextBlock>}</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -201,7 +209,7 @@
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -218,7 +226,7 @@
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 

From ad1779390f9131b8d0cf0a64e21855b803414c96 Mon Sep 17 00:00:00 2001
From: amwx <40413319+amwx@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:38:36 -0400
Subject: [PATCH 33/34] Add UseDarkMode property to DevToolsOptions

---
 .../Diagnostics/DevToolsOptions.cs                  |  5 +++++
 .../Diagnostics/Views/MainWindow.xaml.cs            | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 46ee8e686c..5672641602 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -41,5 +41,10 @@ namespace Avalonia.Diagnostics
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
           = Convetions.DefaultScreenshotHandler;
+
+        /// <summary>
+        /// Gets or sets whether DevTools should use the dark mode theme
+        /// </summary>
+        public bool UseDarkMode { get; set; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index a3cff7f3d3..1e152dcdd4 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -11,6 +11,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Avalonia.Themes.Default;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.Views
@@ -242,7 +243,17 @@ namespace Avalonia.Diagnostics.Views
 
         private void RootClosed(object? sender, EventArgs e) => Close();
 
-        public void SetOptions(DevToolsOptions options) =>
+        public void SetOptions(DevToolsOptions options)
+        {
             (DataContext as MainViewModel)?.SetOptions(options);
+
+            if (options.UseDarkMode)
+            {
+                if (Styles[0] is SimpleTheme st)
+                {
+                    st.Mode = SimpleThemeMode.Dark;
+                }                
+            }
+        }
     }
 }

From b0f2c20c37b09d0e1c1f4b7b422a3c69ac3f8feb Mon Sep 17 00:00:00 2001
From: amwx <40413319+amwx@users.noreply.github.com>
Date: Sat, 26 Mar 2022 15:31:01 -0400
Subject: [PATCH 34/34] ThicknessEditor always use black foreground for
 readibility

---
 .../Diagnostics/Views/LayoutExplorerView.axaml                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
index af6c84a76a..db48aaaa8e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -15,6 +15,7 @@
         <SolidColorBrush x:Key="PaddingHighlightBrush" Color="#CEDA8E" />
         <SolidColorBrush x:Key="SizeBackgroundBrush" Color="#88B2BD" />
         <SolidColorBrush x:Key="SizeHighlightBrush" Color="#9ED0DC" />
+        <SolidColorBrush x:Key="ThicknessEditorForeground" Color="Black" />
     </UserControl.Resources>
 
     <Grid RowDefinitions="*,Auto">
@@ -46,6 +47,7 @@
 
                 <controls:ThicknessEditor Grid.Row="0" Grid.Column="0" Header="margin" VerticalAlignment="Top"
                                           HorizontalAlignment="Center"
+                                          TextBlock.Foreground="{StaticResource ThicknessEditorForeground}"
                                           Background="{StaticResource MarginBackgroundBrush}"
                                           Highlight="{StaticResource MarginHighlightBrush}"
                                           Thickness="{Binding MarginThickness}">