From 1d5703e5657ac6e9f57c7a0bb40e558c179b89fa Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sat, 13 May 2023 11:44:48 -0400
Subject: [PATCH] Remove static color conversion methods

This functionality is already provided by, for example, HsvColor.ToRgb(). Having these separate methods just clutters the API.
---
 src/Avalonia.Base/Media/Color.cs    | 30 -----------------------------
 src/Avalonia.Base/Media/HslColor.cs | 12 +-----------
 src/Avalonia.Base/Media/HsvColor.cs | 12 +-----------
 3 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/src/Avalonia.Base/Media/Color.cs b/src/Avalonia.Base/Media/Color.cs
index 50c2faacc0..7d74b4d602 100644
--- a/src/Avalonia.Base/Media/Color.cs
+++ b/src/Avalonia.Base/Media/Color.cs
@@ -517,21 +517,6 @@ namespace Avalonia.Media
             }
         }
 
-        /// <summary>
-        /// Converts the given RGB color to its HSL color equivalent.
-        /// </summary>
-        /// <param name="color">The color in the RGB color model.</param>
-        /// <returns>A new <see cref="HslColor"/> equivalent to the given RGBA values.</returns>
-        public static HslColor ToHsl(Color color)
-        {
-            // Normalize RGBA components into the 0..1 range
-            return Color.ToHsl(
-                (byteToDouble * color.R),
-                (byteToDouble * color.G),
-                (byteToDouble * color.B),
-                (byteToDouble * color.A));
-        }
-
         /// <summary>
         /// Converts the given RGBA color component values to their HSL color equivalent.
         /// </summary>
@@ -606,21 +591,6 @@ namespace Avalonia.Media
             return new HslColor(a, 60 * h1, saturation, lightness, clampValues: false);
         }
 
-        /// <summary>
-        /// Converts the given RGB color to its HSV color equivalent.
-        /// </summary>
-        /// <param name="color">The color in the RGB color model.</param>
-        /// <returns>A new <see cref="HsvColor"/> equivalent to the given RGBA values.</returns>
-        public static HsvColor ToHsv(Color color)
-        {
-            // Normalize RGBA components into the 0..1 range
-            return Color.ToHsv(
-                (byteToDouble * color.R),
-                (byteToDouble * color.G),
-                (byteToDouble * color.B),
-                (byteToDouble * color.A));
-        }
-
         /// <summary>
         /// Converts the given RGBA color component values to their HSV color equivalent.
         /// </summary>
diff --git a/src/Avalonia.Base/Media/HslColor.cs b/src/Avalonia.Base/Media/HslColor.cs
index 897c883875..624cc88ad4 100644
--- a/src/Avalonia.Base/Media/HslColor.cs
+++ b/src/Avalonia.Base/Media/HslColor.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Media
         /// <param name="color">The RGB color to convert to HSL.</param>
         public HslColor(Color color)
         {
-            var hsl = Color.ToHsl(color);
+            var hsl = color.ToHsl();
 
             A = hsl.A;
             H = hsl.H;
@@ -349,16 +349,6 @@ namespace Avalonia.Media
             return new HslColor(1.0, h, s, l);
         }
 
-        /// <summary>
-        /// Converts the given HSL color to its RGB color equivalent.
-        /// </summary>
-        /// <param name="hslColor">The color in the HSL color model.</param>
-        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSLA values.</returns>
-        public static Color ToRgb(HslColor hslColor)
-        {
-            return HslColor.ToRgb(hslColor.H, hslColor.S, hslColor.L, hslColor.A);
-        }
-
         /// <summary>
         /// Converts the given HSLA color component values to their RGB color equivalent.
         /// </summary>
diff --git a/src/Avalonia.Base/Media/HsvColor.cs b/src/Avalonia.Base/Media/HsvColor.cs
index df68252065..3c6336c445 100644
--- a/src/Avalonia.Base/Media/HsvColor.cs
+++ b/src/Avalonia.Base/Media/HsvColor.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Media
         /// <param name="color">The RGB color to convert to HSV.</param>
         public HsvColor(Color color)
         {
-            var hsv = Color.ToHsv(color);
+            var hsv = color.ToHsv();
 
             A = hsv.A;
             H = hsv.H;
@@ -379,16 +379,6 @@ namespace Avalonia.Media
             return new HsvColor(1.0, h, s, v);
         }
 
-        /// <summary>
-        /// Converts the given HSV color to its RGB color equivalent.
-        /// </summary>
-        /// <param name="hsvColor">The color in the HSV color model.</param>
-        /// <returns>A new RGB <see cref="Color"/> equivalent to the given HSVA values.</returns>
-        public static Color ToRgb(HsvColor hsvColor)
-        {
-            return HsvColor.ToRgb(hsvColor.H, hsvColor.S, hsvColor.V, hsvColor.A);
-        }
-
         /// <summary>
         /// Converts the given HSVA color component values to their RGB color equivalent.
         /// </summary>