From f5ded2632133803632116efad9e5465f4811fee8 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Thu, 8 Jul 2021 13:07:59 +0800
Subject: [PATCH] Update Arc.cs

---
 src/Avalonia.Controls/Shapes/Arc.cs | 47 +++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Avalonia.Controls/Shapes/Arc.cs b/src/Avalonia.Controls/Shapes/Arc.cs
index 4ce72319aa..dad47875c3 100644
--- a/src/Avalonia.Controls/Shapes/Arc.cs
+++ b/src/Avalonia.Controls/Shapes/Arc.cs
@@ -28,33 +28,34 @@ namespace Avalonia.Controls.Shapes
         /// </summary>
         public double StartAngle
         {
-            get { return GetValue(StartAngleProperty); }
-            set { SetValue(StartAngleProperty, value); }
+            get => GetValue(StartAngleProperty);
+            set => SetValue(StartAngleProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets the angle, in degrees, added to the <see cref="StartAngle"/> defining where the arc ends. A positive value is clockwise, negative is counter-clockwise.
+        /// Gets or sets the angle, in degrees, added to the <see cref="StartAngle"/> defining where the arc ends.
+        /// A positive value is clockwise, negative is counter-clockwise.
         /// </summary>
         public double SweepAngle
         {
-            get { return GetValue(SweepAngleProperty); }
-            set { SetValue(SweepAngleProperty, value); }
+            get => GetValue(SweepAngleProperty);
+            set => SetValue(SweepAngleProperty, value);
         }
         
         protected override Geometry CreateDefiningGeometry()
         {
-            double angle1 = DegreesToRad(StartAngle);
-            double angle2 = angle1 + DegreesToRad(SweepAngle);
+            var angle1 = DegreesToRad(StartAngle);
+            var angle2 = angle1 + DegreesToRad(SweepAngle);
             
-            double startAngle = Math.Min(angle1, angle2);
-            double sweepAngle = Math.Max(angle1, angle2);
+            var startAngle = Math.Min(angle1, angle2);
+            var sweepAngle = Math.Max(angle1, angle2);
 
-            double normStart = RadToNormRad(startAngle);
-            double normEnd = RadToNormRad(sweepAngle);
+            var normStart = RadToNormRad(startAngle);
+            var normEnd = RadToNormRad(sweepAngle);
 
             var rect = new Rect(Bounds.Size);
 
-            if ((normStart == normEnd) && (startAngle != sweepAngle)) // complete ring
+            if ((normStart == normEnd) && (startAngle != sweepAngle)) // Complete ring.
             {
                 return new EllipseGeometry(rect.Deflate(StrokeThickness / 2));
             }
@@ -62,28 +63,30 @@ namespace Avalonia.Controls.Shapes
             {
                 return new StreamGeometry();
             }
-            else // partial arc
+            else // Partial arc.
             {
                 var deflatedRect = rect.Deflate(StrokeThickness / 2);
 
-                double centerX = rect.Center.X;
-                double centerY = rect.Center.Y;
+                var centerX = rect.Center.X;
+                var centerY = rect.Center.Y;
 
-                double radiusX = deflatedRect.Width / 2;
-                double radiusY = deflatedRect.Height / 2;
+                var radiusX = deflatedRect.Width / 2;
+                var radiusY = deflatedRect.Height / 2;
                 
-                double angleGap = RadToNormRad(sweepAngle - startAngle);
+                var angleGap = RadToNormRad(sweepAngle - startAngle);
 
-                Point startPoint = GetRingPoint(radiusX, radiusY, centerX, centerY, startAngle);
-                Point endPoint = GetRingPoint(radiusX, radiusY, centerX, centerY, sweepAngle);
+                var startPoint = GetRingPoint(radiusX, radiusY, centerX, centerY, startAngle);
+                var endPoint = GetRingPoint(radiusX, radiusY, centerX, centerY, sweepAngle);
 
-                StreamGeometry arcGeometry = new StreamGeometry();
+                var arcGeometry = new StreamGeometry();
+                
                 using (var ctx = arcGeometry.Open())
                 {
                     ctx.BeginFigure(startPoint, false);
                     ctx.ArcTo(endPoint, new Size(radiusX, radiusY), angleGap, angleGap >= Math.PI, SweepDirection.Clockwise);
                     ctx.EndFigure(false);
                 }
+                
                 return arcGeometry;
             }
         }
@@ -91,7 +94,7 @@ namespace Avalonia.Controls.Shapes
         static double DegreesToRad(double inAngle) =>
             inAngle * Math.PI / 180;
         
-        static double RadToNormRad(double inAngle) => (0 + (inAngle % (Math.PI * 2)) + (Math.PI * 2)) % (Math.PI * 2);
+        static double RadToNormRad(double inAngle) => (inAngle % (Math.PI * 2)) + (Math.PI * 2)) % (Math.PI * 2);
 
         static Point GetRingPoint(double radiusX, double radiusY, double centerX, double centerY, double angle) =>
             new Point((radiusX * Math.Cos(angle)) + centerX, (radiusY * Math.Sin(angle)) + centerY);