From 1a8ec1ce0ef9c7a9d03f4b84c9511bbcf6261400 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 16 Oct 2021 22:54:09 -0400
Subject: [PATCH 1/8] Fix DataGrid headers horizontal scrolling

---
 src/Avalonia.Controls.DataGrid/DataGrid.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index fea02dabf4..10c7c16488 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -2223,6 +2223,7 @@ namespace Avalonia.Controls
             if (IsEnabled && DisplayData.NumDisplayedScrollingElements > 0)
             {
                 var handled = false;
+                var ignoreInvalidate = false;
                 var scrollHeight = 0d;
 
                 // Vertical scroll handling
@@ -2252,8 +2253,7 @@ namespace Avalonia.Controls
                 // Horizontal scroll handling
                 if (delta.X != 0)
                 {
-                    var originalHorizontalOffset = HorizontalOffset;
-                    var horizontalOffset = originalHorizontalOffset - delta.X;
+                    var horizontalOffset = HorizontalOffset - delta.X;
                     var widthNotVisible = Math.Max(0, ColumnsInternal.VisibleEdgedColumnsWidth - CellsWidth);
 
                     if (horizontalOffset < 0)
@@ -2265,16 +2265,20 @@ namespace Avalonia.Controls
                         horizontalOffset = widthNotVisible;
                     }
 
-                    if (horizontalOffset != originalHorizontalOffset)
+                    if (UpdateHorizontalOffset(horizontalOffset))
                     {
-                        HorizontalOffset = horizontalOffset;
+                        // We don't need to invalidate once again after UpdateHorizontalOffset.
+                        ignoreInvalidate = true;
                         handled = true;
                     }
                 }
 
                 if (handled)
                 {
-                    InvalidateRowsMeasure(invalidateIndividualElements: false);
+                    if (!ignoreInvalidate)
+                    {
+                        InvalidateRowsMeasure(invalidateIndividualElements: false);
+                    }
                     return true;
                 }
             }
@@ -2932,7 +2936,7 @@ namespace Avalonia.Controls
             return SetCurrentCellCore(columnIndex, slot, commitEdit: true, endRowEdit: true);
         }
 
-        internal void UpdateHorizontalOffset(double newValue)
+        internal bool UpdateHorizontalOffset(double newValue)
         {
             if (HorizontalOffset != newValue)
             {
@@ -2940,7 +2944,9 @@ namespace Avalonia.Controls
 
                 InvalidateColumnHeadersMeasure();
                 InvalidateRowsMeasure(true);
+                return true;
             }
+            return false;
         }
 
         internal bool UpdateSelectionAndCurrency(int columnIndex, int slot, DataGridSelectionAction action, bool scrollIntoView)

From 9f5f0aa84d082add0ebca3babcd2732c1c83112b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 16 Oct 2021 23:35:27 -0400
Subject: [PATCH 2/8] Do not inherit text properties in Popup

---
 samples/ControlCatalog/Pages/TextBoxPage.xaml          | 10 +++++++++-
 src/Avalonia.Themes.Default/OverlayPopupHost.xaml      |  9 ++++++++-
 src/Avalonia.Themes.Default/PopupRoot.xaml             |  9 ++++++++-
 .../Controls/OverlayPopupHost.xaml                     |  5 +++++
 src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml     |  5 +++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index f631c40eb1..233b309caf 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -11,7 +11,15 @@
               HorizontalAlignment="Center"
               Spacing="16">
       <StackPanel Orientation="Vertical" Spacing="8">
-        <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
+        <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200"
+                 FontFamily="Comic Sans MS"
+                 Foreground="Blue">
+          <TextBox.ContextFlyout>
+            <Flyout>
+              <TextBlock>Custom context flyout</TextBlock>
+            </Flyout>
+          </TextBox.ContextFlyout>        
+        </TextBox>
         <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
         <TextBox Width="200" Watermark="Numeric Watermark" x:Name="numericWatermark"/>
         <TextBox Width="200"
diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
index 36dbc1b761..998b0078cf 100644
--- a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
@@ -1,5 +1,12 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
+<Style xmlns="https://github.com/avaloniaui" 
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector="OverlayPopupHost">
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
+  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+  <Setter Property="FontWeight" Value="400" />
+  <Setter Property="FontStyle" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index 9af4f5a910..b1a6ac0beb 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -1,5 +1,12 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="PopupRoot">
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector="PopupRoot">
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
+  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+  <Setter Property="FontWeight" Value="400" />
+  <Setter Property="FontStyle" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 3809e11251..a755f979d2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,5 +1,10 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
   <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+  <Setter Property="FontWeight" Value="400" />
+  <Setter Property="FontStyle" Value="Normal" />
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 25c71e3493..865b4f44c2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -3,6 +3,11 @@
   <Style Selector="PopupRoot">
     <Setter Property="TransparencyLevelHint" Value="Transparent" />
     <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>

From ef6cb2eb14c4ac81f4c9c5b1fe398dec855cbdd2 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 16 Oct 2021 23:38:52 -0400
Subject: [PATCH 3/8] Do not override default (null) popup background

---
 src/Avalonia.Themes.Default/OverlayPopupHost.xaml         | 1 -
 src/Avalonia.Themes.Default/PopupRoot.xaml                | 1 -
 src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml | 1 -
 src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
index 998b0078cf..f054280e06 100644
--- a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui" 
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector="OverlayPopupHost">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index b1a6ac0beb..b9f68c8421 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -1,7 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector="PopupRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index a755f979d2..c0c56f2ff3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,5 +1,4 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
   <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
   <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
   <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 865b4f44c2..f282586908 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="PopupRoot">
     <Setter Property="TransparencyLevelHint" Value="Transparent" />
-    <Setter Property="Background" Value="{x:Null}" />
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />

From 9f08a1f2538b97a4d67db6b108b63d98c15a029c Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 19 Oct 2021 10:18:58 +0200
Subject: [PATCH 4/8] fixes: Missing CS0618 warning suppression

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

diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index 093f2b12c1..6632573ba2 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -77,7 +77,9 @@ namespace Avalonia.X11
         public void Save(Stream outputStream)
         {
             using (var wr =
+#pragma warning disable CS0618 // Type or member is obsolete
                 new WriteableBitmap(new PixelSize(_width, _height), new Vector(96, 96), PixelFormat.Bgra8888))
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 using (var fb = wr.Lock())
                 {

From ce60f607cf497c8e68a690d1201f257bf9a92f83 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 19 Oct 2021 14:28:05 +0200
Subject: [PATCH 5/8] Added failing tests for #6359.

---
 .../Controls/CustomRenderTests.cs             |  48 ++++++++++++++++++
 .../Clip_With_Transform.expected.png          | Bin 0 -> 621 bytes
 .../GeometryClip_With_Transform.expected.png  | Bin 0 -> 621 bytes
 3 files changed, 48 insertions(+)
 create mode 100644 tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png

diff --git a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
index 8002b572bd..14f5b7c6c7 100644
--- a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
@@ -78,6 +78,54 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             CompareImages();
         }
 
+        [Fact]
+        public async Task GeometryClip_With_Transform()
+        {
+            var target = new Border
+            {
+                Background = Brushes.White,
+                Width = 200,
+                Height = 200,
+                Child = new CustomRenderer((control, context) =>
+                {
+                    using (var transform = context.PushPreTransform(Matrix.CreateTranslation(100, 100)))
+                    using (var clip = context.PushClip(new Rect(0, 0, 100, 100)))
+                    {
+                        context.FillRectangle(Brushes.Blue, new Rect(0, 0, 200, 200));
+                    }
+
+                    context.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task Clip_With_Transform()
+        {
+            var target = new Border
+            {
+                Background = Brushes.White,
+                Width = 200,
+                Height = 200,
+                Child = new CustomRenderer((control, context) =>
+                {
+                    using (var transform = context.PushPreTransform(Matrix.CreateTranslation(100, 100)))
+                    using (var clip = context.PushClip(new Rect(0, 0, 100, 100)))
+                    {
+                        context.FillRectangle(Brushes.Blue, new Rect(0, 0, 200, 200));
+                    }
+
+                    context.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
         [Fact]
         public async Task Opacity()
         {
diff --git a/tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png b/tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c0bfa6fdc1234d417c98ea416e61ce614e1a8d9
GIT binary patch
literal 621
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu@pObhHwBu4M$1`0|S$ar;B4q
z#hkZSH}W1Z;9)VeKJiamJ9ky~+om}W7#}XM%|81`?y-z{r5}I8Y)+OY2L+B1M(oLc
q_JytPo88_9d-)OOb!b!{V()cg?|WSD{T`Tp7(8A5T-G@yGywn#5QfqK

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png b/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c0bfa6fdc1234d417c98ea416e61ce614e1a8d9
GIT binary patch
literal 621
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu@pObhHwBu4M$1`0|S$ar;B4q
z#hkZSH}W1Z;9)VeKJiamJ9ky~+om}W7#}XM%|81`?y-z{r5}I8Y)+OY2L+B1M(oLc
q_JytPo88_9d-)OOb!b!{V()cg?|WSD{T`Tp7(8A5T-G@yGywn#5QfqK

literal 0
HcmV?d00001


From 572eb355e4e7034c04bc5e1e6bbed3161d04f2d9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 19 Oct 2021 14:47:10 +0200
Subject: [PATCH 6/8] Store transform with clip nodes.

Clip and geometry clip nodes were not being correctly applied with the current canvas transform from the time of their rendering. Make the nodes store the current canvas transform like the other drawing nodes.

Fixes #6359.
---
 .../Rendering/SceneGraph/ClipNode.cs          | 20 +++++++++++++++----
 .../SceneGraph/DeferredDrawingContextImpl.cs  | 12 +++++------
 .../Rendering/SceneGraph/GeometryClipNode.cs  | 14 +++++++++++--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
index ada04bfefd..90430bed02 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
@@ -11,19 +11,23 @@ namespace Avalonia.Rendering.SceneGraph
         /// Initializes a new instance of the <see cref="ClipNode"/> class that represents a
         /// clip push.
         /// </summary>
+        /// <param name="transform">The current transform.</param>
         /// <param name="clip">The clip to push.</param>
-        public ClipNode(Rect clip)
+        public ClipNode(Matrix transform, Rect clip)
         {
+            Transform = transform;
             Clip = clip;
         }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ClipNode"/> class that represents a
         /// clip push.
         /// </summary>
+        /// <param name="transform">The current transform.</param>
         /// <param name="clip">The clip to push.</param>
-        public ClipNode(RoundedRect clip)
+        public ClipNode(Matrix transform, RoundedRect clip)
         {
+            Transform = transform;
             Clip = clip;
         }
 
@@ -43,23 +47,31 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         public RoundedRect? Clip { get; }
 
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
         /// <inheritdoc/>
         public bool HitTest(Point p) => false;
 
         /// <summary>
         /// Determines if this draw operation equals another.
         /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
         /// <param name="clip">The clip of the other draw operation.</param>
         /// <returns>True if the draw operations are the same, otherwise false.</returns>
         /// <remarks>
         /// The properties of the other draw operation are passed in as arguments to prevent
         /// allocation of a not-yet-constructed draw operation object.
         /// </remarks>
-        public bool Equals(RoundedRect? clip) => Clip == clip;
+        public bool Equals(Matrix transform, RoundedRect? clip) => Transform == transform && Clip == clip;
 
         /// <inheritdoc/>
         public void Render(IDrawingContextImpl context)
         {
+            context.Transform = Transform;
+
             if (Clip.HasValue)
             {
                 context.PushClip(Clip.Value);
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 3594cb59ee..f4039dc0bc 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -303,9 +303,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<ClipNode>();
 
-            if (next == null || !next.Item.Equals(clip))
+            if (next == null || !next.Item.Equals(Transform, clip))
             {
-                Add(new ClipNode(clip));
+                Add(new ClipNode(Transform, clip));
             }
             else
             {
@@ -318,9 +318,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<ClipNode>();
 
-            if (next == null || !next.Item.Equals(clip))
+            if (next == null || !next.Item.Equals(Transform, clip))
             {
-                Add(new ClipNode(clip));
+                Add(new ClipNode(Transform, clip));
             }
             else
             {
@@ -333,9 +333,9 @@ namespace Avalonia.Rendering.SceneGraph
         {
             var next = NextDrawAs<GeometryClipNode>();
 
-            if (next == null || !next.Item.Equals(clip))
+            if (next == null || !next.Item.Equals(Transform, clip))
             {
-                Add(new GeometryClipNode(clip));
+                Add(new GeometryClipNode(Transform, clip));
             }
             else
             {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
index a2ad83d845..16092d4cbb 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryClipNode.cs
@@ -11,9 +11,11 @@ namespace Avalonia.Rendering.SceneGraph
         /// Initializes a new instance of the <see cref="GeometryClipNode"/> class that represents a
         /// geometry clip push.
         /// </summary>
+        /// <param name="transform">The current transform.</param>
         /// <param name="clip">The clip to push.</param>
-        public GeometryClipNode(IGeometryImpl clip)
+        public GeometryClipNode(Matrix transform, IGeometryImpl clip)
         {
+            Transform = transform;
             Clip = clip;
         }
 
@@ -33,23 +35,31 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         public IGeometryImpl Clip { get; }
 
+        /// <summary>
+        /// Gets the transform with which the node will be drawn.
+        /// </summary>
+        public Matrix Transform { get; }
+
         /// <inheritdoc/>
         public bool HitTest(Point p) => false;
 
         /// <summary>
         /// Determines if this draw operation equals another.
         /// </summary>
+        /// <param name="transform">The transform of the other draw operation.</param>
         /// <param name="clip">The clip of the other draw operation.</param>
         /// <returns>True if the draw operations are the same, otherwise false.</returns>
         /// <remarks>
         /// The properties of the other draw operation are passed in as arguments to prevent
         /// allocation of a not-yet-constructed draw operation object.
         /// </remarks>
-        public bool Equals(IGeometryImpl clip) => Clip == clip;
+        public bool Equals(Matrix transform, IGeometryImpl clip) => Transform == transform && Clip == clip;
 
         /// <inheritdoc/>
         public void Render(IDrawingContextImpl context)
         {
+            context.Transform = Transform;
+
             if (Clip != null)
             {
                 context.PushGeometryClip(Clip);

From 09f82da4dd50d783e3d1ffdfe9c6e04bf83b860f Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Tue, 19 Oct 2021 18:22:47 +0300
Subject: [PATCH 7/8] Fix changing focus with Tab key for Button (#6753)

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

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 6912b2db63..614a18c6b5 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -358,6 +358,13 @@ namespace Avalonia.Controls
             IsPressed = false;
         }
 
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            IsPressed = false;
+        }
+
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             base.OnPropertyChanged(change);

From f8eb073dd77920d2130aa25c2125df0fe450eb8c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 19 Oct 2021 22:32:15 +0200
Subject: [PATCH 8/8] Added missing D2D expected images.

---
 .../CustomRender/Clip_With_Transform.expected.png | Bin 0 -> 634 bytes
 .../GeometryClip_With_Transform.expected.png      | Bin 0 -> 634 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png
 create mode 100644 tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png

diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/Clip_With_Transform.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7420223462ad22a619c2ddf03263d82e082643
GIT binary patch
literal 634
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(GggNyXE}F{C2y?bVIE2NZZ198dhS7UnwjB)iKx^3dL|N$U*174$xpF|Rzw
zT_eE3(&#YKh#A?|*5Wfh>%<)7XL3{!U>R}5{$mx45$c?sRcu;9!1Tl5>FVdQ&MBb@
E07J=cm;e9(

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png b/tests/TestFiles/Direct2D1/Controls/CustomRender/GeometryClip_With_Transform.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7420223462ad22a619c2ddf03263d82e082643
GIT binary patch
literal 634
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(GggNyXE}F{C2y?bVIE2NZZ198dhS7UnwjB)iKx^3dL|N$U*174$xpF|Rzw
zT_eE3(&#YKh#A?|*5Wfh>%<)7XL3{!U>R}5{$mx45$c?sRcu;9!1Tl5>FVdQ&MBb@
E07J=cm;e9(

literal 0
HcmV?d00001