leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Fix text clipping in tiny-skia

Browse source
This commit is contained in:
DKolter 2025-05-04 17:14:51 +02:00 • committed by Héctor Ramón Jiménez
parent e163333161
commit 9d811b46d7
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

45
tiny_skia/src/engine.rs
View file

@ -339,10 +339,15 @@ impl Engine {
paragraph, paragraph,
position, position,
color, color,
clip_bounds: _, // TODO clip_bounds: local_clip_bounds,
transformation: local_transformation, transformation: local_transformation,
} => { } => {
let transformation = transformation * *local_transformation; let transformation = transformation * *local_transformation;
let Some(clip_bounds) = clip_bounds
.intersection(&(*local_clip_bounds * transformation))
else {
return;
};
let physical_bounds = let physical_bounds =
Rectangle::new(*position, paragraph.min_bounds) Rectangle::new(*position, paragraph.min_bounds)
@ -352,8 +357,13 @@ impl Engine {
return; return;
} }
let clip_mask = (!physical_bounds.is_within(&clip_bounds)) let clip_mask = match physical_bounds.is_within(&clip_bounds) {
.then_some(clip_mask as &_); true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};
self.text_pipeline.draw_paragraph( self.text_pipeline.draw_paragraph(
paragraph, paragraph,
@ -368,10 +378,15 @@ impl Engine {
editor, editor,
position, position,
color, color,
clip_bounds: _, // TODO clip_bounds: local_clip_bounds,
transformation: local_transformation, transformation: local_transformation,
} => { } => {
let transformation = transformation * *local_transformation; let transformation = transformation * *local_transformation;
let Some(clip_bounds) = clip_bounds
.intersection(&(*local_clip_bounds * transformation))
else {
return;
};
let physical_bounds = let physical_bounds =
Rectangle::new(*position, editor.bounds) * transformation; Rectangle::new(*position, editor.bounds) * transformation;
@ -380,8 +395,13 @@ impl Engine {
return; return;
} }
let clip_mask = (!physical_bounds.is_within(&clip_bounds)) let clip_mask = match physical_bounds.is_within(&clip_bounds) {
.then_some(clip_mask as &_); true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};
self.text_pipeline.draw_editor( self.text_pipeline.draw_editor(
editor, editor,
@ -402,16 +422,21 @@ impl Engine {
align_x, align_x,
align_y, align_y,
shaping, shaping,
clip_bounds: text_bounds, // TODO clip_bounds: local_clip_bounds,
} => { } => {
let physical_bounds = *text_bounds * transformation; let physical_bounds = *local_clip_bounds * transformation;
if !clip_bounds.intersects(&physical_bounds) { if !clip_bounds.intersects(&physical_bounds) {
return; return;
} }
let clip_mask = (!physical_bounds.is_within(&clip_bounds)) let clip_mask = match physical_bounds.is_within(&clip_bounds) {
.then_some(clip_mask as &_); true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};
self.text_pipeline.draw_cached( self.text_pipeline.draw_cached(
content, content,