diff options
author | 2024-01-16 02:11:48 +0100 | |
---|---|---|
committer | 2024-01-16 02:11:48 +0100 | |
commit | c4ba657de86d7606587dad5124f435141258f570 (patch) | |
tree | d7a105c8173218c9a279ecd96766c536dbd5f940 /graphics | |
parent | 50c310fd9f692eafb2350827636ffbd6d7b6c9b9 (diff) | |
parent | 73e7cf16e315cd179bf416e9051a562f7a8b648a (diff) | |
download | iced-c4ba657de86d7606587dad5124f435141258f570.tar.gz iced-c4ba657de86d7606587dad5124f435141258f570.tar.bz2 iced-c4ba657de86d7606587dad5124f435141258f570.zip |
Merge pull request #2203 from iced-rs/update-glyphon
Update `glyphon` to `0.4`
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/src/text.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/graphics/src/text.rs b/graphics/src/text.rs index 8fd037fe..7c4b5e31 100644 --- a/graphics/src/text.rs +++ b/graphics/src/text.rs @@ -9,7 +9,6 @@ pub use paragraph::Paragraph; pub use cosmic_text; -use crate::color; use crate::core::font::{self, Font}; use crate::core::text::Shaping; use crate::core::{Color, Point, Rectangle, Size}; @@ -173,12 +172,7 @@ pub fn to_shaping(shaping: Shaping) -> cosmic_text::Shaping { /// Converts some [`Color`] to a [`cosmic_text::Color`]. pub fn to_color(color: Color) -> cosmic_text::Color { - let [r, g, b, a] = color::pack(color).components(); + let [r, g, b, a] = color.into_rgba8(); - cosmic_text::Color::rgba( - (r * 255.0) as u8, - (g * 255.0) as u8, - (b * 255.0) as u8, - (a * 255.0) as u8, - ) + cosmic_text::Color::rgba(r, g, b, a) } |