Skip to content

Fix: TextFormat::valign not applied correctly with custom line_height #8030

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

Open
rustbasic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: TextFormat::valign not applied correctly with custom line_height #8030

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
13 changes: 7 additions & 6 deletions crates/epaint/src/text/text_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,13 +680,14 @@ fn galley_from_rows(
for glyph in &mut row.glyphs {
let format = &job.sections[glyph.section_index as usize].format;

glyph.pos.y = glyph.font_face_ascent

// Apply valign to the different in height of the entire row, and the height of this `Font`:
+ format.valign.to_factor() * (max_row_height - glyph.line_height)
// Vertically aligns glyph's font_face_height within max_row_height using format.valign.
let valign_offset_y =
format.valign.to_factor() * (max_row_height - glyph.font_face_height);

// When mixing different `FontImpl` (e.g. latin and emojis),
// we always center the difference:
// When mixing different `FontImpl` (e.g. latin and emojis),
// we always center the difference:
glyph.pos.y = glyph.font_face_ascent
+ valign_offset_y
+ 0.5 * (glyph.font_height - glyph.font_face_height);

glyph.pos.y = point_scale.round_to_pixel(glyph.pos.y);
Expand Down
Loading