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

Apply Transform scaling to text primitives

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-10-24 02:51:02 +02:00
parent 9b8614a4e2
commit aa41d7656e
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wgpu/src/layer.rs
View file

@ -169,7 +169,7 @@ impl<'a> Layer<'a> {
layer.text.push(Text::Cached(text::Cached {
content,
bounds: *bounds * transformation,
size: *size,
size: *size * transformation.scale_y(),
line_height: *line_height,
color: *color,
font: *font,

9
wgpu/src/text.rs
View file

@ -124,11 +124,13 @@ impl Pipeline {
vertical_alignment,
color,
clip_bounds,
scale,
) = match section {
Text::Paragraph {
position,
color,
clip_bounds,
scale,
..
} => {
use crate::core::text::Paragraph as _;
@ -145,12 +147,14 @@ impl Pipeline {
paragraph.vertical_alignment(),
*color,
*clip_bounds,
*scale,
)
}
Text::Editor {
position,
color,
clip_bounds,
scale,
..
} => {
use crate::core::text::Editor as _;
@ -167,6 +171,7 @@ impl Pipeline {
alignment::Vertical::Top,
*color,
*clip_bounds,
*scale,
)
}
Text::Cached(text) => {
@ -186,6 +191,7 @@ impl Pipeline {
text.vertical_alignment,
text.color,
text.clip_bounds,
1.0,
)
}
Text::Raw(text) => {
@ -205,6 +211,7 @@ impl Pipeline {
alignment::Vertical::Top,
text.color,
text.clip_bounds,
1.0,
)
}
};
@ -234,7 +241,7 @@ impl Pipeline {
buffer,
left,
top,
scale: scale_factor,
scale: scale * scale_factor,
bounds: glyphon::TextBounds {
left: clip_bounds.x as i32,
top: clip_bounds.y as i32,