From 1f7cf04c572c06fa1e6d63c2fb225ab41a745244 Mon Sep 17 00:00:00 2001
From: Patrick Tellier <patrick.tellier@iriscorporate.com>
Date: Thu, 2 Jun 2022 14:10:20 +0200
Subject: [PATCH 1/2] Use own Pen (if set) in GeometryDrawing.GetBounds

---
 src/Avalonia.Visuals/Media/GeometryDrawing.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/GeometryDrawing.cs b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
index e46e3a7d5f..aa12f90f23 100644
--- a/src/Avalonia.Visuals/Media/GeometryDrawing.cs
+++ b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
@@ -68,7 +68,8 @@ namespace Avalonia.Media
 
         public override Rect GetBounds()
         {
-            return Geometry?.GetRenderBounds(s_boundsPen) ?? Rect.Empty;
+            IPen pen = Pen ?? s_boundsPen;
+            return Geometry?.GetRenderBounds(pen) ?? Rect.Empty;
         }
     }
 }

From f733c0f57a86d13864fc0c02e82401764e01d0ad Mon Sep 17 00:00:00 2001
From: Patrick Tellier <patrick.tellier@iriscorporate.com>
Date: Fri, 3 Jun 2022 12:42:42 +0200
Subject: [PATCH 2/2] Use own Pen (if set) in GeometryDrawing.GetBounds : Add
 unit tests

---
 .../Media/GeometryDrawingTests.cs             | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs

diff --git a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
new file mode 100644
index 0000000000..06e46c1a06
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
@@ -0,0 +1,52 @@
+using Avalonia.Media;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+
+using Avalonia.Direct2D1.RenderTests;
+
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class GeometryDrawingTests : TestBase
+    {
+        public GeometryDrawingTests()
+            : base(@"Media\GeometryDrawing")
+        {
+        }
+
+        private GeometryDrawing CreateGeometryDrawing()
+        {
+            GeometryDrawing geometryDrawing = new GeometryDrawing();
+            EllipseGeometry ellipse = new EllipseGeometry();
+            ellipse.RadiusX = 100;
+            ellipse.RadiusY = 100;
+            geometryDrawing.Geometry = ellipse;
+            return geometryDrawing;
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+            geometryDrawing.Pen = new Pen(new SolidColorBrush(Color.FromArgb(255, 0, 0, 0)), 10);
+
+            Assert.Equal(210, geometryDrawing.GetBounds().Height);
+            Assert.Equal(210, geometryDrawing.GetBounds().Width);
+
+        }
+
+        [Fact]
+        public void DrawingGeometry_WithoutPen()
+        {
+            GeometryDrawing geometryDrawing = CreateGeometryDrawing();
+
+            Assert.Equal(200, geometryDrawing.GetBounds().Height);
+            Assert.Equal(200, geometryDrawing.GetBounds().Width);
+        }
+
+
+    }
+}