Refactor 6

Author: 0x5bfa

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

@@ -177,37 +177,26 @@ ArcSegment CreateArcSegment(double radiusWidth, double radiusHeight)
 						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.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;
-					}
+				if (EndAngle < StartAngle)
+				{
+					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) <= -180.0;
+					finalArcSegment.SweepDirection = SweepDirection is SweepDirection.Clockwise
+						? SweepDirection.Counterclockwise
+						: SweepDirection.Clockwise;
+				}
+				else
+				{
+					finalArcSegment.IsLargeArc = (EndAngle - StartAngle) >= 180.0;
+					finalArcSegment.SweepDirection = SweepDirection;
 				}
 
 				finalArcSegment.Size = new(radiusWidth, radiusHeight);

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

@@ -15,57 +15,90 @@ public partial class StorageBar
 	{
 		private void OnValueBarHeightChanged(double oldValue, double newValue)
 		{
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		private void OnTrackBarHeightChanged(double oldValue, double newValue)
 		{
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		private void OnBarShapeChanged(BarShapes oldValue, BarShapes newValue)
 		{
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		private void OnPercentChanged(double oldValue, double newValue)
 		{
 			return; //Read-only
 
 			DoubleToPercentage(Value, Minimum, Maximum);
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		private void OnPercentCautionChanged(double oldValue, double newValue)
 		{
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		private void OnPercentCriticalChanged(double oldValue, double newValue)
 		{
-			UpdateControl(this);
+			UpdateControl();
 		}
 
 		/// <inheritdoc/>
 		protected override void OnValueChanged(double oldValue, double newValue)
 		{
 			_oldValue = oldValue;
 			base.OnValueChanged(oldValue, newValue);
-			UpdateValue(this, Value, _oldValue, false, -1.0);
+			UpdateValue(Value, _oldValue, false, -1.0);
 		}
 
 		/// <inheritdoc/>
 		protected override void OnMaximumChanged(double oldValue, double newValue)
 		{
 			base.OnMaximumChanged(oldValue, newValue);
-			UpdateValue(this, oldValue, newValue, false, -1.0);
+			UpdateValue(oldValue, newValue, false, -1.0);
 		}
 
 		/// <inheritdoc/>
 		protected override void OnMinimumChanged(double oldValue, double newValue)
 		{
 			base.OnMinimumChanged(oldValue, newValue);
-			UpdateValue(this, oldValue, newValue, false, -1.0);
+			UpdateValue(oldValue, newValue, false, -1.0);
+		}
+
+		private void StorageBar_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+		{
+			UpdateControl();
+		}
+
+		private void StorageBar_Unloaded(object sender, RoutedEventArgs e)
+		{
+			SizeChanged -= StorageBar_SizeChanged;
+			Unloaded -= StorageBar_Unloaded;
+			IsEnabledChanged -= StorageBar_IsEnabledChanged;
+		}
+
+		private void StorageBar_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			Size minSize;
+
+			if (DesiredSize.Width < MinWidth || DesiredSize.Height < MinHeight ||
+				e.NewSize.Width < MinWidth || e.NewSize.Height < MinHeight)
+			{
+				Width = MinWidth;
+				Height = MinHeight;
+
+				minSize = new(MinWidth, MinHeight);
+			}
+			else
+			{
+				minSize = e.NewSize;
+			}
+
+			UpdateContainer(minSize);
+			UpdateControl();
 		}
 	}
 }