github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 19:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7570 from penpot/elenatorro-12386-fix-missplaced-text-strokes

Browse Source 
🐛 Fix texts offset-y calculation when there are multiple lines and stroke paints
This commit is contained in:
Aitor Moreno 2025-10-21 16:46:53 +02:00 committed by GitHub
commit 69f2e131d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
render-wasm/src/render/text.rs
View File

@ -220,7 +220,6 @@ fn draw_text(
canvas.save_layer(&layer_rec); canvas.save_layer(&layer_rec);
for paragraph_builder_group in paragraph_builder_groups { for paragraph_builder_group in paragraph_builder_groups {
let mut group_offset_y = global_offset_y; let mut group_offset_y = global_offset_y;
let group_len = paragraph_builder_group.len();
for (paragraph_index, paragraph_builder) in paragraph_builder_group.iter_mut().enumerate() { for (paragraph_index, paragraph_builder) in paragraph_builder_group.iter_mut().enumerate() {
let mut paragraph = paragraph_builder.build(); let mut paragraph = paragraph_builder.build();
@ -230,25 +229,18 @@ fn draw_text(
// a reminder in the future to keep digging why the ideographic_baseline // a reminder in the future to keep digging why the ideographic_baseline
// works so well and not the paragraph_height. I think we should test // works so well and not the paragraph_height. I think we should test
// this more. // this more.
let ideographic_baseline = paragraph.ideographic_baseline(); if paragraph_index == 0 {
let xy = (shape.selrect().x(), shape.selrect().y() + group_offset_y); group_offset_y += paragraph.ideographic_baseline();
}
let xy = (shape.selrect().x(), shape.selrect().y() + global_offset_y);
paragraph.paint(canvas, xy); paragraph.paint(canvas, xy);
for line_metrics in paragraph.get_line_metrics().iter() { for line_metrics in paragraph.get_line_metrics().iter() {
render_text_decoration(canvas, &paragraph, paragraph_builder, line_metrics, xy); render_text_decoration(canvas, &paragraph, paragraph_builder, line_metrics, xy);
} }
#[allow(clippy::collapsible_else_if)]
if group_len == 1 {
group_offset_y += ideographic_baseline;
} else {
if paragraph_index == 0 {
group_offset_y += ideographic_baseline;
}
}
} }
global_offset_y = group_offset_y; global_offset_y += group_offset_y;
} }
} }