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

Support configurable LineHeight in text widgets

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-04 13:00:16 +02:00
parent 8e8808f0e1
commit 9499a8f9e6
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
24 changed files with 337 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tiny_skia/src/backend.rs
View file

@ -216,6 +216,7 @@ impl Backend {
bounds,
color,
size,
line_height,
font,
horizontal_alignment,
vertical_alignment,
@ -233,13 +234,15 @@ impl Backend {
self.text_pipeline.draw(
content,
(*bounds + translation) * scale_factor,
*bounds + translation,
*color,
*size * scale_factor,
*size,
*line_height,
*font,
*horizontal_alignment,
*vertical_alignment,
*shaping,
scale_factor,
pixels,
clip_mask,
);
@ -626,18 +629,26 @@ impl backend::Text for Backend {
&self,
contents: &str,
size: f32,
line_height: text::LineHeight,
font: Font,
bounds: Size,
shaping: text::Shaping,
) -> (f32, f32) {
self.text_pipeline
.measure(contents, size, font, bounds, shaping)
self.text_pipeline.measure(
contents,
size,
line_height,
font,
bounds,
shaping,
)
}
fn hit_test(
&self,
contents: &str,
size: f32,
line_height: text::LineHeight,
font: Font,
bounds: Size,
shaping: text::Shaping,
@ -647,6 +658,7 @@ impl backend::Text for Backend {
self.text_pipeline.hit_test(
contents,
size,
line_height,
font,
bounds,
shaping,