Merge pull request #11773 from robloo/ellipse-geometry

EllipseGeometry Clone Fix

# Conflicts:
#	src/Avalonia.Base/AvaloniaObjectExtensions.cs
#	src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs

Author: jmacato

packages/Avalonia/Avalonia.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.16" />
       <PackageReference Include="Avalonia.BuildServices" Version="0.0.29" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" >

src/Avalonia.Base/Utilities/TypeUtilities.cs

@@ -303,7 +303,7 @@ public static bool TryConvertImplicit(Type to, object? value, out object? result
         /// if the value could not be converted.
         /// </summary>
         /// <param name="value">The value to convert.</param>
-        /// <param name="type">The type to convert to..</param>
+        /// <param name="type">The type to convert to.</param>
         /// <param name="culture">The culture to use.</param>
         /// <returns>A value of <paramref name="type"/>.</returns>
         public static object? ConvertOrDefault(object? value, Type type, CultureInfo culture)

src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs

@@ -213,7 +213,7 @@ public enum PopupPositionerConstraintAdjustment
         /// 
         /// If the adjusted position also ends up being constrained, the resulting position of the
         /// FlipX adjustment will be the one before the adjustment.
-        /// /// </remarks>
+        /// </remarks>
         FlipX = 4,
 
         /// <summary>

src/Avalonia.Visuals/Media/EllipseGeometry.cs

@@ -55,6 +55,10 @@ public EllipseGeometry(Rect rect) : this()
         /// <summary>
         /// Gets or sets a rect that defines the bounds of the ellipse.
         /// </summary>
+        /// <remarks>
+        /// When set, this takes priority over the other properties that define an
+        /// ellipse using a center point and X/Y-axis radii.
+        /// </remarks>
         public Rect Rect
         {
             get => GetValue(RectProperty);
@@ -64,6 +68,10 @@ public Rect Rect
         /// <summary>
         /// Gets or sets a double that defines the radius in the X-axis of the ellipse.
         /// </summary>
+        /// <remarks>
+        /// In order for this property to be used, <see cref="Rect"/> must not be set
+        /// (equal to the default <see cref="Avalonia.Rect"/> value).
+        /// </remarks>
         public double RadiusX
         {
             get => GetValue(RadiusXProperty);
@@ -73,6 +81,10 @@ public double RadiusX
         /// <summary>
         /// Gets or sets a double that defines the radius in the Y-axis of the ellipse.
         /// </summary>
+        /// <remarks>
+        /// In order for this property to be used, <see cref="Rect"/> must not be set
+        /// (equal to the default <see cref="Avalonia.Rect"/> value).
+        /// </remarks>
         public double RadiusY
         {
             get => GetValue(RadiusYProperty);
@@ -82,6 +94,10 @@ public double RadiusY
         /// <summary>
         /// Gets or sets a point that defines the center of the ellipse.
         /// </summary>
+        /// <remarks>
+        /// In order for this property to be used, <see cref="Rect"/> must not be set
+        /// (equal to the default <see cref="Avalonia.Rect"/> value).
+        /// </remarks>
         public Point Center
         {
             get => GetValue(CenterProperty);
@@ -91,7 +107,30 @@ public Point Center
         /// <inheritdoc/>
         public override Geometry Clone()
         {
-            return new EllipseGeometry(Rect);
+            // Note that the ellipse properties are used in two modes:
+            //
+            //  1. Rect-only Mode:
+            //     Directly set the rectangle bounds the ellipse will fill
+            //
+            //  2. Center + Radii Mode:
+            //     Set a center-point and then X/Y-axis radii that are used to
+            //     calculate the rectangle bounds the ellipse will fill.
+            //     This is the only mode supported by WPF.
+            //
+            // Rendering the ellipse will only ever use one of these two modes
+            // based on if the Rect property is set (not equal to default).
+            //
+            // This means it would normally be fine to copy ONLY the Rect property
+            // when it is set. However, while it would render the same, it isn't
+            // a true clone. We want to include all the properties here regardless
+            // of the rendering mode that will eventually be used.
+            return new EllipseGeometry()
+            {
+                Rect = Rect,
+                RadiusX = RadiusX,
+                RadiusY = RadiusY,
+                Center = Center,
+            };
         }
 
         /// <inheritdoc/>

src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs

@@ -35,7 +35,7 @@ IFormattedTextImpl CreateFormattedText(
         /// Creates an ellipse geometry implementation.
         /// </summary>
         /// <param name="rect">The bounds of the ellipse.</param>
-        /// <returns>An ellipse geometry..</returns>
+        /// <returns>An ellipse geometry.</returns>
         IGeometryImpl CreateEllipseGeometry(Rect rect);
 
         /// <summary>