Skip to content

Fix text clipping in tiny-skia #2929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hecrj merged 1 commit into from
Nov 25, 2025
Merged

Fix text clipping in tiny-skia #2929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions tiny_skia/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,15 @@ impl Engine {
paragraph,
position,
color,
clip_bounds: _, // TODO
clip_bounds: local_clip_bounds,
transformation: local_transformation,
} => {
let transformation = transformation * *local_transformation;
let Some(clip_bounds) = clip_bounds
.intersection(&(*local_clip_bounds * transformation))
else {
return;
};

let physical_bounds =
Rectangle::new(*position, paragraph.min_bounds)
Expand All @@ -352,8 +357,13 @@ impl Engine {
return;
}

let clip_mask = (!physical_bounds.is_within(&clip_bounds))
.then_some(clip_mask as &_);
let clip_mask = match physical_bounds.is_within(&clip_bounds) {
true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};

self.text_pipeline.draw_paragraph(
paragraph,
Expand All @@ -368,10 +378,15 @@ impl Engine {
editor,
position,
color,
clip_bounds: _, // TODO
clip_bounds: local_clip_bounds,
transformation: local_transformation,
} => {
let transformation = transformation * *local_transformation;
let Some(clip_bounds) = clip_bounds
.intersection(&(*local_clip_bounds * transformation))
else {
return;
};

let physical_bounds =
Rectangle::new(*position, editor.bounds) * transformation;
Expand All @@ -380,8 +395,13 @@ impl Engine {
return;
}

let clip_mask = (!physical_bounds.is_within(&clip_bounds))
.then_some(clip_mask as &_);
let clip_mask = match physical_bounds.is_within(&clip_bounds) {
true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};

self.text_pipeline.draw_editor(
editor,
Expand All @@ -402,16 +422,21 @@ impl Engine {
align_x,
align_y,
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) {
return;
}

let clip_mask = (!physical_bounds.is_within(&clip_bounds))
.then_some(clip_mask as &_);
let clip_mask = match physical_bounds.is_within(&clip_bounds) {
true => None,
false => {
adjust_clip_mask(clip_mask, clip_bounds);
Some(clip_mask as &_)
}
};

self.text_pipeline.draw_cached(
content,
Expand Down
Loading