format and fix

LoneWandererProductions · Aug 18, 2024 · 3088756 · 3088756
1 parent f5964e9
commit 3088756
Show file tree

Hide file tree

Showing 142 changed files with 815 additions and 2,116 deletions.
diff --git a/CommonControls/AssemblyInfo.cs b/CommonControls/AssemblyInfo.cs
@@ -7,4 +7,4 @@
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
     //(used if a resource is not found in the page,
     // app, or any theme specific resource dictionaries)
-)]
+)]
diff --git a/CommonControls/ColorPicker.xaml.cs b/CommonControls/ColorPicker.xaml.cs
@@ -153,10 +153,7 @@ public double Hue
             get => _hue;
             set
             {
-                if (_hue.IsEqualTo(value, 10) || value * 180 / Math.PI is > 360 or < 0)
-                {
-                    return;
-                }
+                if (_hue.IsEqualTo(value, 10) || value * 180 / Math.PI is > 360 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -177,10 +174,7 @@ public double Sat
             get => _sat;
             set
             {
-                if (_sat.IsEqualTo(value, 10) || value is > 1 or < 0)
-                {
-                    return;
-                }
+                if (_sat.IsEqualTo(value, 10) || value is > 1 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -201,10 +195,7 @@ public double Val
             get => _val;
             set
             {
-                if (_val.IsEqualTo(value, 10) || value is > 1 or < 0)
-                {
-                    return;
-                }
+                if (_val.IsEqualTo(value, 10) || value is > 1 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -225,10 +216,7 @@ public int R
             get => _r;
             set
             {
-                if (_r == value || value is > 255 or < 0)
-                {
-                    return;
-                }
+                if (_r == value || value is > 255 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -249,10 +237,7 @@ public int G
             get => _g;
             set
             {
-                if (_g == value || value is > 255 or < 0)
-                {
-                    return;
-                }
+                if (_g == value || value is > 255 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -273,10 +258,7 @@ public int B
             get => _b;
             set
             {
-                if (_b == value || value is > 255 or < 0)
-                {
-                    return;
-                }
+                if (_b == value || value is > 255 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -296,10 +278,7 @@ public int Alpha
             get => _alpha;
             set
             {
-                if (_alpha == value || value is > 255 or < 0)
-                {
-                    return;
-                }
+                if (_alpha == value || value is > 255 or < 0) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -327,10 +306,7 @@ public string Hex
             get => _hex;
             set
             {
-                if (_hex == value)
-                {
-                    return;
-                }
+                if (_hex == value) return;
 
                 ColorPickerRegister.ColorChanged = true;
 
@@ -460,10 +436,7 @@ private void SetPreview()
 
             _ = CanvasPreview.Children.Add(rectangle);
 
-            if (ColorPickerRegister.ColorChanged)
-            {
-                OnColorChanged();
-            }
+            if (ColorPickerRegister.ColorChanged) OnColorChanged();
         }
 
         /// <summary>
@@ -474,4 +447,4 @@ private void OnColorChanged()
             ColorChanged?.Invoke(ColorPickerRegister.Colors);
         }
     }
-}
+}
diff --git a/CommonControls/ColorPickerHelper.cs b/CommonControls/ColorPickerHelper.cs
@@ -35,4 +35,4 @@ internal static Rectangle GetColorPreview(ColorHsv colorHsv)
             return rectangle;
         }
     }
-}
+}
diff --git a/CommonControls/ColorPickerRegister.cs b/CommonControls/ColorPickerRegister.cs
@@ -41,4 +41,4 @@ internal static class ColorPickerRegister
         /// </value>
         internal static ColorHsv Colors { get; set; }
     }
-}
+}
diff --git a/CommonControls/ColorProcessing.cs b/CommonControls/ColorProcessing.cs
@@ -49,7 +49,7 @@ internal static bool InCircle(double x, double y)
             var xDelta = x - Center;
             var yDelta = y - Center;
 
-            var dist = (int)Math.Sqrt((xDelta * xDelta) + (yDelta * yDelta));
+            var dist = (int)Math.Sqrt(xDelta * xDelta + yDelta * yDelta);
 
             return (ColorPickerRegister.InternSize / 2).Interval(dist, 20);
         }
@@ -62,12 +62,9 @@ internal static bool InCircle(double x, double y)
         /// <returns>New Hue Value</returns>
         internal static double CalcHue(double x, double y)
         {
-            var angle = Math.Atan2(y - Center, x - Center) + (Math.PI / 2);
+            var angle = Math.Atan2(y - Center, x - Center) + Math.PI / 2;
 
-            if (angle < 0)
-            {
-                angle += 2 * Math.PI;
-            }
+            if (angle < 0) angle += 2 * Math.PI;
 
             return angle;
         }
@@ -90,29 +87,17 @@ internal static bool InTriangle(double x, double y)
             //measures: max y = 190, max x = 189
 
             //upper and lower limit
-            if (y is < 16 or >= 135)
-            {
-                return false;
-            }
+            if (y is < 16 or >= 135) return false;
 
             // Inside
             var sqrt3 = Math.Sqrt(3);
             var x1 = (x - Center) * 1.0 / InnerRadius;
             var y1 = (y - Center) * 1.0 / InnerRadius;
-            if ((0 * x1) + (2 * y1) > 1)
-            {
-                return false;
-            }
+            if (0 * x1 + 2 * y1 > 1) return false;
 
-            if ((sqrt3 * x1) + (-1 * y1) > 1)
-            {
-                return false;
-            }
+            if (sqrt3 * x1 + -1 * y1 > 1) return false;
 
-            if ((-sqrt3 * x1) + (-1 * y1) > 1)
-            {
-                return false;
-            }
+            if (-sqrt3 * x1 + -1 * y1 > 1) return false;
 
             return true;
         }
@@ -128,7 +113,7 @@ internal static double CalcVal(double x, double y)
             var x1 = (x - Center) * 1.0 / InnerRadius;
             var y1 = (y - Center) * 1.0 / InnerRadius;
 
-            return ((Sqrt3 * x1) - y1 + 2) / 3;
+            return (Sqrt3 * x1 - y1 + 2) / 3;
         }
 
         /// <summary>
@@ -142,7 +127,7 @@ internal static double CalcSat(double x, double y)
             var x1 = (x - Center) * 1.0 / InnerRadius;
             var y1 = (y - Center) * 1.0 / InnerRadius;
 
-            return (1 - (2 * y1)) / ((Sqrt3 * x1) - y1 + 2);
+            return (1 - 2 * y1) / (Sqrt3 * x1 - y1 + 2);
         }
     }
-}
+}
diff --git a/CommonControls/ColorSelection.xaml.cs b/CommonControls/ColorSelection.xaml.cs
@@ -128,10 +128,7 @@ private void CmbColor_SelectionChanged(object sender, SelectionChangedEventArgs
         {
             try
             {
-                if (CmbColor?.SelectedItem is not PropertyInfo property)
-                {
-                    return;
-                }
+                if (CmbColor?.SelectedItem is not PropertyInfo property) return;
 
                 var selectedColor = (Color)property.GetValue(null, null);
                 StartColor = _colorDct.FirstOrDefault(x => x.Value == selectedColor).Key;
@@ -184,10 +181,7 @@ private static Dictionary<string, Color> InitiateColors()
         /// </summary>
         private void SwitchToStartColor()
         {
-            if (string.IsNullOrEmpty(StartColor))
-            {
-                return;
-            }
+            if (string.IsNullOrEmpty(StartColor)) return;
 
             CmbColor.SelectedItem = typeof(Colors).GetProperty(StartColor);
         }
@@ -202,4 +196,4 @@ private static void ShowErrorMessageBox(string message, Exception ex)
             MessageBox.Show($"{message}: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
         }
     }
-}
+}
diff --git a/CommonControls/Colorpick.cs b/CommonControls/Colorpick.cs
@@ -135,10 +135,7 @@ internal static void Selection(double x, double y, int alpha)
 
             //Check circle
             check = ColorProcessing.InCircle(x, y);
-            if (check)
-            {
-                _hue = ColorProcessing.CalcHue(x, y);
-            }
+            if (check) _hue = ColorProcessing.CalcHue(x, y);
 
             ColorPickerRegister.Colors = new ColorHsv(_hue, _sat, _val, alpha);
         }
@@ -189,23 +186,18 @@ private static Image DrawImage(double hue = 3.3, double sat = 1.0, double val =
         /// <returns>Clicked results</returns>
         private static PickResult Pick(double x, double y)
         {
-            var distanceFromCenter = Math.Sqrt(((x - Center) * (x - Center)) + ((y - Center) * (y - Center)));
+            var distanceFromCenter = Math.Sqrt((x - Center) * (x - Center) + (y - Center) * (y - Center));
             var sqrt3 = Math.Sqrt(3);
 
             if (distanceFromCenter > OuterRadius)
                 // Outside
-            {
                 return new PickResult { Area = Area.Outside };
-            }
 
             if (distanceFromCenter > InnerRadius)
             {
                 // Wheel
-                var angle = Math.Atan2(y - Center, x - Center) + (Math.PI / 2);
-                if (angle < 0)
-                {
-                    angle += 2 * Math.PI;
-                }
+                var angle = Math.Atan2(y - Center, x - Center) + Math.PI / 2;
+                if (angle < 0) angle += 2 * Math.PI;
 
                 var hue = angle;
 
@@ -215,24 +207,15 @@ private static PickResult Pick(double x, double y)
             // Inside
             var x1 = (x - Center) * 1.0 / InnerRadius;
             var y1 = (y - Center) * 1.0 / InnerRadius;
-            if ((0 * x1) + (2 * y1) > 1)
-            {
-                return new PickResult { Area = Area.Outside };
-            }
+            if (0 * x1 + 2 * y1 > 1) return new PickResult { Area = Area.Outside };
 
-            if ((sqrt3 * x1) + (-1 * y1) > 1)
-            {
-                return new PickResult { Area = Area.Outside };
-            }
+            if (sqrt3 * x1 + -1 * y1 > 1) return new PickResult { Area = Area.Outside };
 
-            if ((-sqrt3 * x1) + (-1 * y1) > 1)
-            {
-                return new PickResult { Area = Area.Outside };
-            }
+            if (-sqrt3 * x1 + -1 * y1 > 1) return new PickResult { Area = Area.Outside };
 
             // Triangle
-            var sat = (1 - (2 * y1)) / ((sqrt3 * x1) - y1 + 2);
-            var val = ((sqrt3 * x1) - y1 + 2) / 3;
+            var sat = (1 - 2 * y1) / (sqrt3 * x1 - y1 + 2);
+            var val = (sqrt3 * x1 - y1 + 2) / 3;
 
             return new PickResult { Area = Area.Triangle, Sat = sat, Val = val };
         }
@@ -249,33 +232,18 @@ private static Color Hsv(double hue, double sat, double val, double alpha)
         {
             var chroma = val * sat;
             const double step = Math.PI / 3;
-            var intern = chroma * (1 - Math.Abs((hue / step % 2.0) - 1));
+            var intern = chroma * (1 - Math.Abs(hue / step % 2.0 - 1));
             var shift = val - chroma;
 
-            if (hue < 1 * step)
-            {
-                return Rgb(shift + chroma, shift + intern, shift + 0, alpha);
-            }
+            if (hue < 1 * step) return Rgb(shift + chroma, shift + intern, shift + 0, alpha);
 
-            if (hue < 2 * step)
-            {
-                return Rgb(shift + intern, shift + chroma, shift + 0, alpha);
-            }
+            if (hue < 2 * step) return Rgb(shift + intern, shift + chroma, shift + 0, alpha);
 
-            if (hue < 3 * step)
-            {
-                return Rgb(shift + 0, shift + chroma, shift + intern, alpha);
-            }
+            if (hue < 3 * step) return Rgb(shift + 0, shift + chroma, shift + intern, alpha);
 
-            if (hue < 4 * step)
-            {
-                return Rgb(shift + 0, shift + intern, shift + chroma, alpha);
-            }
+            if (hue < 4 * step) return Rgb(shift + 0, shift + intern, shift + chroma, alpha);
 
-            if (hue < 5 * step)
-            {
-                return Rgb(shift + intern, shift + 0, shift + chroma, alpha);
-            }
+            if (hue < 5 * step) return Rgb(shift + intern, shift + 0, shift + chroma, alpha);
 
             return Rgb(shift + chroma, shift + 0, shift + intern, alpha);
         }
@@ -290,7 +258,7 @@ private static Point GetWheelPosition()
 
             return new Point
             {
-                X = Center + (middleRadius * Math.Sin(_hue)), Y = Center - (middleRadius * Math.Cos(_hue))
+                X = Center + middleRadius * Math.Sin(_hue), Y = Center - middleRadius * Math.Cos(_hue)
             };
         }
 
@@ -304,8 +272,8 @@ private static Point GetTrianglePosition()
 
             return new Point
             {
-                X = Center + (InnerRadius * ((2 * _val) - (_sat * _val) - 1) * sqrt3 / 2),
-                Y = Center + (InnerRadius * (1 - (3 * _sat * _val)) / 2)
+                X = Center + InnerRadius * (2 * _val - _sat * _val - 1) * sqrt3 / 2,
+                Y = Center + InnerRadius * (1 - 3 * _sat * _val) / 2
             };
         }
 
@@ -364,4 +332,4 @@ internal struct PickResult
         /// </value>
         internal double Val { get; init; }
     }
-}
+}
diff --git a/CommonControls/ColorpickerMenu.xaml.cs b/CommonControls/ColorpickerMenu.xaml.cs
@@ -101,4 +101,4 @@ private void AddColor(ColorHsv colorHsv)
             _ = CanvasPreview.Children.Add(rectangle);
         }
     }
-}
+}
diff --git a/CommonControls/ComCtlResources.cs b/CommonControls/ComCtlResources.cs
@@ -83,4 +83,4 @@ internal static class ComCtlResources
         /// </summary>
         internal const string Separator = " , ";
     }
-}
+}