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

Account for transformation in Text::visible_bounds

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-04-10 16:26:55 +02:00
parent 1e802e776c
commit 32cd456fb9
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
graphics/src/text.rs
View file

@ -78,10 +78,12 @@ impl Text {
position, position,
paragraph, paragraph,
clip_bounds, clip_bounds,
transformation,
.. ..
} => ( } => (
Rectangle::new(*position, paragraph.min_bounds) Rectangle::new(*position, paragraph.min_bounds)
.intersection(clip_bounds), .intersection(clip_bounds)
.map(|bounds| bounds * *transformation),
Some(paragraph.horizontal_alignment), Some(paragraph.horizontal_alignment),
Some(paragraph.vertical_alignment), Some(paragraph.vertical_alignment),
), ),
@ -89,10 +91,12 @@ impl Text {
editor, editor,
position, position,
clip_bounds, clip_bounds,
transformation,
.. ..
} => ( } => (
Rectangle::new(*position, editor.bounds) Rectangle::new(*position, editor.bounds)
.intersection(clip_bounds), .intersection(clip_bounds)
.map(|bounds| bounds * *transformation),
None, None,
None, None,
), ),

4
tiny_skia/src/layer.rs
View file

@ -200,9 +200,7 @@ impl Layer {
|text| { |text| {
text.visible_bounds() text.visible_bounds()
.into_iter() .into_iter()
.filter_map(|bounds| { .map(|bounds| bounds * text_a.transformation())
bounds.intersection(&text_a.clip_bounds())
})
.collect() .collect()
}, },
|text_a, text_b| text_a == text_b, |text_a, text_b| text_a == text_b,