migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Fix text horizontal alignment

Browse Source
This commit is contained in:
Hubert Głuchowski
2024-12-05 18:27:38 +01:00
parent c6592ec898
commit 25da82279f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/epaint/src/text/text_layout.rs
View File

@@ -113,7 +113,7 @@ pub fn layout(fonts: &mut FontsImpl, job: Arc<LayoutJob>) -> Galley {
let justify_row = justify && !placed_row.ends_with_newline && !is_last_row; let justify_row = justify && !placed_row.ends_with_newline && !is_last_row;
halign_and_justify_row( halign_and_justify_row(
point_scale, point_scale,
Arc::get_mut(&mut placed_row.row).unwrap(), placed_row,
job.halign, job.halign,
job.wrap.max_width, job.wrap.max_width,
justify_row, justify_row,
@@ -512,11 +512,13 @@ fn replace_last_glyph_with_overflow_character(
/// Ignores the Y coordinate. /// Ignores the Y coordinate.
fn halign_and_justify_row( fn halign_and_justify_row(
point_scale: PointScale, point_scale: PointScale,
row: &mut Row, placed_row: &mut PlacedRow,
halign: Align, halign: Align,
wrap_width: f32, wrap_width: f32,
justify: bool, justify: bool,
) { ) {
let row = Arc::get_mut(&mut placed_row.row).unwrap();
if row.glyphs.is_empty() { if row.glyphs.is_empty() {
return; return;
} }
@@ -584,7 +586,8 @@ fn halign_and_justify_row(
/ (num_spaces_in_range as f32); / (num_spaces_in_range as f32);
} }
let mut translate_x = target_min_x - original_min_x - extra_x_per_glyph * glyph_range.0 as f32; placed_row.pos.x = point_scale.round_to_pixel(target_min_x);
let mut translate_x = -original_min_x - extra_x_per_glyph * glyph_range.0 as f32;
for glyph in &mut row.glyphs { for glyph in &mut row.glyphs {
glyph.pos.x += translate_x; glyph.pos.x += translate_x;