Merge pull request iced-rs#3274 from janTatesa/interpolate_color

feat(color): implement Interpolated

Author: hecrj

core/src/color.rs

@@ -1,3 +1,5 @@
+use crate::animation::Interpolable;
+
 /// A color in the `sRGB` color space.
 ///
 /// # String Representation
@@ -146,6 +148,22 @@ impl Color {
         }
     }
 
+    /// Mixes the current [`Color`] with another one by the given factor.
+    pub fn mix(self, b: Color, factor: f32) -> Color {
+        let b_amount = factor.clamp(0.0, 1.0);
+        let a_amount = 1.0 - b_amount;
+
+        let a_linear = self.into_linear().map(|c| c * a_amount);
+        let b_linear = b.into_linear().map(|c| c * b_amount);
+
+        Color::from_linear_rgba(
+            a_linear[0] + b_linear[0],
+            a_linear[1] + b_linear[1],
+            a_linear[2] + b_linear[2],
+            a_linear[3] + b_linear[3],
+        )
+    }
+
     /// Returns the relative luminance of the [`Color`].
     /// <https://www.w3.org/TR/WCAG21/#dfn-relative-luminance>
     #[must_use]
@@ -330,6 +348,13 @@ impl From<Color> for palette::Srgba<f32> {
     }
 }
 
+impl Interpolable for Color {
+    /// Interpolates the color. Equivalent to [`Color::mix`].
+    fn interpolated(&self, other: Self, ratio: f32) -> Self {
+        self.mix(other, ratio)
+    }
+}
+
 /// Creates a [`Color`] with shorter and cleaner syntax.
 ///
 /// # Examples

core/src/theme/palette.rs

@@ -510,7 +510,7 @@ pub struct Primary {
 impl Primary {
     /// Generates a set of [`Primary`] colors from the base, background, and text colors.
     pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
+        let weak = base.mix(background, 0.4);
         let strong = deviate(base, 0.1);
 
         Self {
@@ -537,9 +537,9 @@ impl Secondary {
     pub fn generate(base: Color, text: Color) -> Self {
         let factor = if is_dark(base) { 0.2 } else { 0.4 };
 
-        let weak = mix(deviate(base, 0.1), text, factor);
-        let strong = mix(deviate(base, 0.3), text, factor);
-        let base = mix(deviate(base, 0.2), text, factor);
+        let weak = deviate(base, 0.1).mix(text, factor);
+        let strong = deviate(base, 0.3).mix(text, factor);
+        let base = deviate(base, 0.2).mix(text, factor);
 
         Self {
             base: Pair::new(base, text),
@@ -563,7 +563,7 @@ pub struct Success {
 impl Success {
     /// Generates a set of [`Success`] colors from the base, background, and text colors.
     pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
+        let weak = base.mix(background, 0.4);
         let strong = deviate(base, 0.1);
 
         Self {
@@ -588,7 +588,7 @@ pub struct Warning {
 impl Warning {
     /// Generates a set of [`Warning`] colors from the base, background, and text colors.
     pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
+        let weak = base.mix(background, 0.4);
         let strong = deviate(base, 0.1);
 
         Self {
@@ -613,7 +613,7 @@ pub struct Danger {
 impl Danger {
     /// Generates a set of [`Danger`] colors from the base, background, and text colors.
     pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
+        let weak = base.mix(background, 0.4);
         let strong = deviate(base, 0.1);
 
         Self {
@@ -677,22 +677,6 @@ pub fn deviate(color: Color, amount: f32) -> Color {
     }
 }
 
-/// Mixes two colors by the given factor.
-pub fn mix(a: Color, b: Color, factor: f32) -> Color {
-    let b_amount = factor.clamp(0.0, 1.0);
-    let a_amount = 1.0 - b_amount;
-
-    let a_linear = a.into_linear().map(|c| c * a_amount);
-    let b_linear = b.into_linear().map(|c| c * b_amount);
-
-    Color::from_linear_rgba(
-        a_linear[0] + b_linear[0],
-        a_linear[1] + b_linear[1],
-        a_linear[2] + b_linear[2],
-        a_linear[3] + b_linear[3],
-    )
-}
-
 /// Computes a [`Color`] from the given text color that is
 /// readable on top of the given background color.
 pub fn readable(background: Color, text: Color) -> Color {
@@ -719,9 +703,9 @@ pub fn readable(background: Color, text: Color) -> Color {
     let black_contrast = background.relative_contrast(Color::BLACK);
 
     if white_contrast >= black_contrast {
-        mix(Color::WHITE, background, 0.05)
+        Color::WHITE.mix(background, 0.05)
     } else {
-        mix(Color::BLACK, background, 0.05)
+        Color::BLACK.mix(background, 0.05)
     }
 }