CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-21 09:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Fix text align selrect and update regression tests

Browse Source
This commit is contained in:
Elena Torro
2025-10-22 15:02:54 +02:00
parent 140290cd60
commit a30315c91c
16 changed files with 94 additions and 5633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,47 +200,45 @@ fn draw_text(
shape: &Shape,
paragraph_builder_groups: &mut [Vec<ParagraphBuilder>],
) {
let container_height = if let crate::shapes::Type::Text(text_content) = &shape.shape_type {
text_content.size.height
} else {
shape.selrect().height()
};
let paragraph_width = shape.selrect().width();
let total_content_height =
calculate_all_paragraphs_height(paragraph_builder_groups, paragraph_width);
let text_content = shape.get_text_content();
// FIXME: this does not always return the height we need
// let text_height = text_content.size.height;
let text_width = text_content.get_width();
let text_height = text_content.get_height(text_width);
let selrect_height = shape.selrect().height();
let mut global_offset_y = match shape.vertical_align() {
VerticalAlign::Center => (container_height - total_content_height) / 2.0,
VerticalAlign::Bottom => container_height - total_content_height,
VerticalAlign::Center => (selrect_height - text_height) / 2.0,
VerticalAlign::Bottom => selrect_height - text_height,
_ => 0.0,
};
let layer_rec = SaveLayerRec::default();
canvas.save_layer(&layer_rec);
for paragraph_builder_group in paragraph_builder_groups {
for paragraph_builder_group in paragraph_builder_groups.iter_mut() {
let mut group_offset_y = global_offset_y;
let total_paragraphs = paragraph_builder_group.len();
for (paragraph_index, paragraph_builder) in paragraph_builder_group.iter_mut().enumerate() {
let mut paragraph = paragraph_builder.build();
paragraph.layout(paragraph_width);
paragraph.layout(text_width);
let _paragraph_height = paragraph.height();
// FIXME: I've kept the _paragraph_height variable to have
// 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
// this more.
if paragraph_index == 0 {
let xy = (shape.selrect().x(), shape.selrect().y() + group_offset_y);
paragraph.paint(canvas, xy);
if paragraph_index == total_paragraphs - 1 {
group_offset_y += paragraph.ideographic_baseline();
}
let xy = (shape.selrect().x(), shape.selrect().y() + global_offset_y);
paragraph.paint(canvas, xy);
for line_metrics in paragraph.get_line_metrics().iter() {
render_text_decoration(canvas, &paragraph, paragraph_builder, line_metrics, xy);
}
}
global_offset_y += group_offset_y;
global_offset_y = group_offset_y;
}
}
@@ -415,6 +413,7 @@ fn render_text_decoration(
}
}
#[allow(dead_code)]
fn calculate_total_paragraphs_height(paragraphs: &mut [ParagraphBuilder], width: f32) -> f32 {
paragraphs
.iter_mut()
@@ -426,6 +425,7 @@ fn calculate_total_paragraphs_height(paragraphs: &mut [ParagraphBuilder], width:
.sum()
}
#[allow(dead_code)]
fn calculate_all_paragraphs_height(
paragraph_groups: &mut [Vec<ParagraphBuilder>],
width: f32,