me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Srgb and Srgba from palette directly

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-26 00:03:34 +02:00
parent 2a00aaa747
commit b741893013
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
core/src/color.rs
View file

@ -1,5 +1,5 @@
#[cfg(feature = "palette")] #[cfg(feature = "palette")]
use palette::rgb::{Rgb, Rgba}; use palette::rgb::{Srgb, Srgba};
/// A color in the sRGB color space. /// A color in the sRGB color space.
#[derive(Debug, Clone, Copy, PartialEq, Default)] #[derive(Debug, Clone, Copy, PartialEq, Default)]
@ -184,33 +184,33 @@ macro_rules! color {
#[cfg(feature = "palette")] #[cfg(feature = "palette")]
/// Converts from palette's `Rgba` type to a [`Color`]. /// Converts from palette's `Rgba` type to a [`Color`].
impl From<Rgba> for Color { impl From<Srgba> for Color {
fn from(rgba: Rgba) -> Self { fn from(rgba: Srgba) -> Self {
Color::new(rgba.red, rgba.green, rgba.blue, rgba.alpha) Color::new(rgba.red, rgba.green, rgba.blue, rgba.alpha)
} }
} }
#[cfg(feature = "palette")] #[cfg(feature = "palette")]
/// Converts from [`Color`] to palette's `Rgba` type. /// Converts from [`Color`] to palette's `Rgba` type.
impl From<Color> for Rgba { impl From<Color> for Srgba {
fn from(c: Color) -> Self { fn from(c: Color) -> Self {
Rgba::new(c.r, c.g, c.b, c.a) Srgba::new(c.r, c.g, c.b, c.a)
} }
} }
#[cfg(feature = "palette")] #[cfg(feature = "palette")]
/// Converts from palette's `Rgb` type to a [`Color`]. /// Converts from palette's `Rgb` type to a [`Color`].
impl From<Rgb> for Color { impl From<Srgb> for Color {
fn from(rgb: Rgb) -> Self { fn from(rgb: Srgb) -> Self {
Color::new(rgb.red, rgb.green, rgb.blue, 1.0) Color::new(rgb.red, rgb.green, rgb.blue, 1.0)
} }
} }
#[cfg(feature = "palette")] #[cfg(feature = "palette")]
/// Converts from [`Color`] to palette's `Rgb` type. /// Converts from [`Color`] to palette's `Rgb` type.
impl From<Color> for Rgb { impl From<Color> for Srgb {
fn from(c: Color) -> Self { fn from(c: Color) -> Self {
Rgb::new(c.r, c.g, c.b) Srgb::new(c.r, c.g, c.b)
} }
} }
@ -223,8 +223,8 @@ mod tests {
#[test] #[test]
fn srgba_traits() { fn srgba_traits() {
let c = Color::from_rgb(0.5, 0.4, 0.3); let c = Color::from_rgb(0.5, 0.4, 0.3);
// Round-trip conversion to the palette:Rgba type // Round-trip conversion to the palette::Srgba type
let s: Rgba = c.into(); let s: Srgba = c.into();
let r: Color = s.into(); let r: Color = s.into();
assert_eq!(c, r); assert_eq!(c, r);
} }
@ -235,14 +235,15 @@ mod tests {
let c2 = Color::from_rgb(0.2, 0.5, 0.3); let c2 = Color::from_rgb(0.2, 0.5, 0.3);
// Convert to linear color for manipulation // Convert to linear color for manipulation
let l1 = Rgba::from(c1).into_linear(); let l1 = Srgba::from(c1).into_linear();
let l2 = Rgba::from(c2).into_linear(); let l2 = Srgba::from(c2).into_linear();
// Take the lighter of each of the RGB components // Take the lighter of each of the sRGB components
let lighter = l1.lighten(l2); let lighter = l1.lighten(l2);
// Convert back to our Color // Convert back to our Color
let r: Color = Rgba::from_linear(lighter).into(); let r: Color = Srgba::from_linear(lighter).into();
assert_eq!( assert_eq!(
r, r,
Color { Color {