Refactor 2

Author: 0x5bfa

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

@@ -24,14 +24,14 @@ public partial class RingShape : Path
 		protected virtual void OnStartAngleChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			ValidateAngle(this, StartAngle, true);
+			StartAngle = ValidateAngle(StartAngle);
 			EndUpdate();
 		}
 
 		protected virtual void OnEndAngleChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			ValidateAngle(this, EndAngle, false);
+			EndAngle = ValidateAngle(EndAngle);
 			EndUpdate();
 		}
 
@@ -44,28 +44,28 @@ protected virtual void OnSweepDirectionChanged(SweepDirection oldValue, SweepDir
 		protected virtual void OnMinAngleChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			CalculateAndSetNormalizedAngles(this, MinAngle, MaxAngle);
+			CalculateAndSetNormalizedAngles();
 			EndUpdate();
 		}
 
 		protected virtual void OnMaxAngleChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			CalculateAndSetNormalizedAngles(this, MinAngle, MaxAngle);
+			CalculateAndSetNormalizedAngles();
 			EndUpdate();
 		}
 
 		protected virtual void OnRadiusWidthChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			AdjustRadiusWidth(this, RadiusWidth, StrokeThickness);
+			AdjustRadiusWidth();
 			EndUpdate();
 		}
 
 		protected virtual void OnRadiusHeightChanged(double oldValue, double newValue)
 		{
 			BeginUpdate();
-			AdjustRadiusHeight(this, RadiusHeight, StrokeThickness);
+			AdjustRadiusHeight();
 			EndUpdate();
 		}
 
@@ -74,5 +74,17 @@ protected virtual void OnIsCircleChanged(bool oldValue, bool newValue)
 			BeginUpdate();
 			EndUpdate();
 		}
+
+		private void RingShape_SizeChanged(object obj, SizeChangedEventArgs e)
+		{
+			BeginUpdate();
+			EndUpdate();
+		}
+
+		private void OnStrokeThicknessChanged(DependencyObject d, DependencyProperty dp)
+		{
+			BeginUpdate();
+			EndUpdate();
+		}
 	}
 }

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

@@ -41,22 +41,6 @@ public RingShape()
 			RegisterPropertyChangedCallback(StrokeThicknessProperty, OnStrokeThicknessChanged);
 		}
 
-		#region PropertyChanged Events
-
-		private void RingShape_SizeChanged(object obj, SizeChangedEventArgs e)
-		{
-			BeginUpdate();
-			EndUpdate();
-		}
-
-		private void OnStrokeThicknessChanged(DependencyObject d, DependencyProperty dp)
-		{
-			BeginUpdate();
-			EndUpdate();
-		}
-
-		#endregion
-
 		#region RingShape Path Updates
 
 		/// <summary>