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

Make Color::from_rgb8 and Color::from_rgba8 const

Browse source
This commit is contained in:
rhysd 2025-01-25 09:11:27 +09:00
parent ca61706cfd
commit c6da74702e
2 changed files with 14 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/color.rs
View file

@ -74,16 +74,16 @@ impl Color {
} }
/// Creates a [`Color`] from its RGB8 components. /// Creates a [`Color`] from its RGB8 components.
pub fn from_rgb8(r: u8, g: u8, b: u8) -> Color { pub const fn from_rgb8(r: u8, g: u8, b: u8) -> Color {
Color::from_rgba8(r, g, b, 1.0) Color::from_rgba8(r, g, b, 1.0)
} }
/// Creates a [`Color`] from its RGB8 components and an alpha value. /// Creates a [`Color`] from its RGB8 components and an alpha value.
pub fn from_rgba8(r: u8, g: u8, b: u8, a: f32) -> Color { pub const fn from_rgba8(r: u8, g: u8, b: u8, a: f32) -> Color {
Color { Color {
r: f32::from(r) / 255.0, r: r as f32 / 255.0,
g: f32::from(g) / 255.0, g: g as f32 / 255.0,
b: f32::from(b) / 255.0, b: b as f32 / 255.0,
a, a,
} }
} }

54
core/src/theme/palette.rs
View file

@ -29,56 +29,20 @@ impl Palette {
pub const LIGHT: Self = Self { pub const LIGHT: Self = Self {
background: Color::WHITE, background: Color::WHITE,
text: Color::BLACK, text: Color::BLACK,
primary: Color::from_rgb( primary: Color::from_rgb8(0x5E, 0x7C, 0xE2),
0x5E as f32 / 255.0, success: Color::from_rgb8(0x12, 0x66, 0x4F),
0x7C as f32 / 255.0, warning: Color::from_rgb8(0xFF, 0xC1, 0x4E),
0xE2 as f32 / 255.0, danger: Color::from_rgb8(0xC3, 0x42, 0x3F),
),
success: Color::from_rgb(
0x12 as f32 / 255.0,
0x66 as f32 / 255.0,
0x4F as f32 / 255.0,
),
warning: Color::from_rgb(
0xFF as f32 / 255.0,
0xC1 as f32 / 255.0,
0x4E as f32 / 255.0,
),
danger: Color::from_rgb(
0xC3 as f32 / 255.0,
0x42 as f32 / 255.0,
0x3F as f32 / 255.0,
),
}; };
/// The built-in dark variant of a [`Palette`]. /// The built-in dark variant of a [`Palette`].
pub const DARK: Self = Self { pub const DARK: Self = Self {
background: Color::from_rgb( background: Color::from_rgb8(0x20, 0x22, 0x25),
0x20 as f32 / 255.0,
0x22 as f32 / 255.0,
0x25 as f32 / 255.0,
),
text: Color::from_rgb(0.90, 0.90, 0.90), text: Color::from_rgb(0.90, 0.90, 0.90),
primary: Color::from_rgb( primary: Color::from_rgb8(0x5E, 0x7C, 0xE2),
0x5E as f32 / 255.0, success: Color::from_rgb8(0x12, 0x66, 0x4F),
0x7C as f32 / 255.0, warning: Color::from_rgb8(0xFF, 0xC1, 0x4E),
0xE2 as f32 / 255.0, danger: Color::from_rgb8(0xC3, 0x42, 0x3F),
),
success: Color::from_rgb(
0x12 as f32 / 255.0,
0x66 as f32 / 255.0,
0x4F as f32 / 255.0,
),
warning: Color::from_rgb(
0xFF as f32 / 255.0,
0xC1 as f32 / 255.0,
0x4E as f32 / 255.0,
),
danger: Color::from_rgb(
0xC3 as f32 / 255.0,
0x42 as f32 / 255.0,
0x3F as f32 / 255.0,
),
}; };
/// The built-in [Dracula] variant of a [`Palette`]. /// The built-in [Dracula] variant of a [`Palette`].