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

Draft glyphon implementation of text pipeline for iced_wgpu

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-01-31 06:29:21 +01:00
parent b9a9576207
commit baf51a8fcf
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
8 changed files with 187 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
graphics/src/layer.rs
View file

@ -12,7 +12,8 @@ pub use text::Text;
use crate::alignment;
use crate::{
Background, Font, Point, Primitive, Rectangle, Size, Vector, Viewport,
Background, Color, Font, Point, Primitive, Rectangle, Size, Vector,
Viewport,
};
/// A group of primitives that should be clipped together.
@ -60,7 +61,7 @@ impl<'a> Layer<'a> {
Point::new(11.0, 11.0 + 25.0 * i as f32),
Size::INFINITY,
),
color: [0.9, 0.9, 0.9, 1.0],
color: Color::new(0.9, 0.9, 0.9, 1.0),
size: 20.0,
font: Font::Default,
horizontal_alignment: alignment::Horizontal::Left,
@ -71,7 +72,7 @@ impl<'a> Layer<'a> {
overlay.text.push(Text {
bounds: text.bounds + Vector::new(-1.0, -1.0),
color: [0.0, 0.0, 0.0, 1.0],
color: Color::BLACK,
..text
});
}
@ -136,7 +137,7 @@ impl<'a> Layer<'a> {
content,
bounds: *bounds + translation,
size: *size,
color: color.into_linear(),
color: *color,
font: *font,
horizontal_alignment: *horizontal_alignment,
vertical_alignment: *vertical_alignment,

4
graphics/src/layer/text.rs
View file

@ -1,4 +1,4 @@
use crate::{alignment, Font, Rectangle};
use crate::{alignment, Color, Font, Rectangle};
/// A paragraph of text.
#[derive(Debug, Clone, Copy)]
@ -10,7 +10,7 @@ pub struct Text<'a> {
pub bounds: Rectangle,
/// The color of the [`Text`], in __linear RGB_.
pub color: [f32; 4],
pub color: Color,
/// The size of the [`Text`].
pub size: f32,