Refactor 4

Author: 0x5bfa

src/Files.App.Controls/Storage/RingShape/RingShape.cs

@@ -73,7 +73,12 @@ private void UpdatePath()
 			// If the ring is closed and complete
 			if (EndAngle >= StartAngle + 360)
 			{
-				Data = DrawEllipse();
+				Data = new()
+				{
+					Center = Center,
+					RadiusX = IsCircle ? _equalRadius : RadiusWidth,
+					RadiusY = IsCircle ? _equalRadius : RadiusHeight,
+				};
 			}
 			else
 			{
@@ -86,32 +91,6 @@ private void UpdatePath()
 
 		#region Drawing Updates
 
-		private EllipseGeometry DrawEllipse()
-		{
-			EllipseGeometry eg;
-
-			if (IsCircle)
-			{
-				eg = new()
-				{
-					Center = Center,
-					RadiusX = _equalRadius,
-					RadiusY = _equalRadius,
-				};
-			}
-			else
-			{
-				eg = new()
-				{
-					Center = Center,
-					RadiusX = _equalRadius,
-					RadiusY = _equalRadius,
-				};
-			}
-
-			return eg;
-		}
-
 		private PathGeometry DrawArc()
 		{
 			var newCenter = Center;
@@ -125,90 +104,78 @@ private PathGeometry DrawArc()
 
 			if (IsCircle)
 			{
-				ActualRadiusWidth = _equalRadius;
-				ActualRadiusHeight = _equalRadius;
-
-				// Start Point
-				pathFigure.StartPoint = ArcStartPoint();
-
-				// Arc Segment and End Point
-				arcSegment = CreateArcSegment();
+				pathFigure.StartPoint = ArcStartPoint(_equalRadius, _equalRadius);
+				arcSegment = CreateArcSegment(_equalRadius, _equalRadius);
 			}
 			else
 			{
-				ActualRadiusWidth = RadiusWidth;
-				ActualRadiusHeight = RadiusHeight;
-
-				// Start Point
-				pathFigure.StartPoint = ArcStartPoint();
-
-				// Arc Segment and End Point
-				arcSegment = CreateArcSegment();
+				pathFigure.StartPoint = ArcStartPoint(RadiusWidth, RadiusHeight);
+				arcSegment = CreateArcSegment(RadiusWidth, RadiusHeight);
 			}
 
 			pathFigure.Segments.Add(arcSegment);
 			pathGeometry.Figures.Add(pathFigure);
 
 			return pathGeometry;
-		}
 
-		private Point ArcStartPoint()
-		{
-			return SweepDirection is SweepDirection.Counterclockwise
-				? new(
-					Center.X - Math.Sin(StartAngle * DegreesToRadians ) * RadiusWidth,
-					Center.Y - Math.Cos(StartAngle * DegreesToRadians ) * RadiusHeight)
-				: new(
-					Center.X + Math.Sin(StartAngle * DegreesToRadians) * RadiusWidth,
-					Center.Y - Math.Cos(StartAngle * DegreesToRadians) * RadiusHeight);
-		}
-
-		private ArcSegment CreateArcSegment()
-		{ 
-			var finalArcSegment = new ArcSegment();
-
-			if (SweepDirection is SweepDirection.Counterclockwise)
+			Point ArcStartPoint(double radius, double radius)
 			{
-				finalArcSegment.Point =
-					new(
-						Center.X - Math.Sin(EndAngle * DegreesToRadians) * RadiusWidth,
-						Center.Y - Math.Cos(EndAngle * DegreesToRadians) * RadiusHeight);
-
-				if (EndAngle < StartAngle)
-				{
-					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) <= -180.0;
-					finalArcSegment.SweepDirection = SweepDirection.Clockwise;
-				}
-				else
-				{
-					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
-					finalArcSegment.SweepDirection = SweepDirection.Counterclockwise;
-				}
+				return SweepDirection is SweepDirection.Counterclockwise
+					? new(
+						Center.X - Math.Sin(StartAngle * DegreesToRadians ) * RadiusWidth,
+						Center.Y - Math.Cos(StartAngle * DegreesToRadians ) * RadiusHeight)
+					: new(
+						Center.X + Math.Sin(StartAngle * DegreesToRadians) * RadiusWidth,
+						Center.Y - Math.Cos(StartAngle * DegreesToRadians) * RadiusHeight);
 			}
-			else
-			{
-				finalArcSegment.Point =
-					new(
-						Center.X + Math.Sin(EndAngle * DegreesToRadians) * RadiusWidth,
-						Center.Y - Math.Cos(EndAngle * DegreesToRadians) * RadiusHeight);
 
-				//ArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
+			ArcSegment CreateArcSegment(double radius, double radius)
+			{ 
+				var finalArcSegment = new ArcSegment();
 
-				if (EndAngle < StartAngle)
+				if (SweepDirection is SweepDirection.Counterclockwise)
 				{
-					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) <= -180.0;
-					finalArcSegment.SweepDirection = SweepDirection.Counterclockwise;
+					finalArcSegment.Point =
+						new(
+							Center.X - Math.Sin(EndAngle * DegreesToRadians) * RadiusWidth,
+							Center.Y - Math.Cos(EndAngle * DegreesToRadians) * RadiusHeight);
+
+					if (EndAngle < StartAngle)
+					{
+						finalArcSegment.IsLargeArc = (EndAngle - StartAngle) <= -180.0;
+						finalArcSegment.SweepDirection = SweepDirection.Clockwise;
+					}
+					else
+					{
+						finalArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
+						finalArcSegment.SweepDirection = SweepDirection.Counterclockwise;
+					}
 				}
 				else
 				{
-					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
-					finalArcSegment.SweepDirection = SweepDirection.Clockwise;
+					finalArcSegment.Point =
+						new(
+							Center.X + Math.Sin(EndAngle * DegreesToRadians) * RadiusWidth,
+							Center.Y - Math.Cos(EndAngle * DegreesToRadians) * RadiusHeight);
+
+					//ArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
+
+					if (EndAngle < StartAngle)
+					{
+						finalArcSegment.IsLargeArc = (EndAngle - StartAngle) <= -180.0;
+						finalArcSegment.SweepDirection = SweepDirection.Counterclockwise;
+					}
+					else
+					{
+						finalArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
+						finalArcSegment.SweepDirection = SweepDirection.Clockwise;
+					}
 				}
-			}
 
-			finalArcSegment.Size = new(RadiusWidth, RadiusHeight);
+				finalArcSegment.Size = new(RadiusWidth, RadiusHeight);
 
-			return finalArcSegment;
+				return finalArcSegment;
+			}
 		}
 
 		#endregion