skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix text sometime line-breaking or truncating too early (#5077)

This commit is contained in:
Emil Ernerfeldt 2024-09-06 13:24:11 +02:00 committed by GitHub
parent b2dcb7d8db
commit 6b7f431237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ fn rows_from_paragraphs(
}); });
} else { } else {
let paragraph_max_x = paragraph.glyphs.last().unwrap().max_x(); let paragraph_max_x = paragraph.glyphs.last().unwrap().max_x();
if paragraph_max_x <= job.wrap.max_width { if paragraph_max_x <= job.effective_wrap_width() {
// Early-out optimization: the whole paragraph fits on one row. // Early-out optimization: the whole paragraph fits on one row.
let paragraph_min_x = paragraph.glyphs[0].pos.x; let paragraph_min_x = paragraph.glyphs[0].pos.x;
rows.push(Row { rows.push(Row {
@ -241,11 +241,7 @@ fn rows_from_paragraphs(
} }
fn line_break(paragraph: &Paragraph, job: &LayoutJob, out_rows: &mut Vec<Row>, elided: &mut bool) { fn line_break(paragraph: &Paragraph, job: &LayoutJob, out_rows: &mut Vec<Row>, elided: &mut bool) {
let wrap_width_margin = if job.round_output_size_to_nearest_ui_point { let wrap_width = job.effective_wrap_width();
0.5
} else {
0.0
};
// Keeps track of good places to insert row break if we exceed `wrap_width`. // Keeps track of good places to insert row break if we exceed `wrap_width`.
let mut row_break_candidates = RowBreakCandidates::default(); let mut row_break_candidates = RowBreakCandidates::default();
@ -262,7 +258,7 @@ fn line_break(paragraph: &Paragraph, job: &LayoutJob, out_rows: &mut Vec<Row>, e
let potential_row_width = paragraph.glyphs[i].max_x() - row_start_x; let potential_row_width = paragraph.glyphs[i].max_x() - row_start_x;
if job.wrap.max_width + wrap_width_margin < potential_row_width { if wrap_width < potential_row_width {
// Row break: // Row break:
if first_row_indentation > 0.0 if first_row_indentation > 0.0
@ -420,7 +416,7 @@ fn replace_last_glyph_with_overflow_character(
}); });
} }
if row_width(row) <= job.wrap.max_width || row.glyphs.len() == 1 { if row_width(row) <= job.effective_wrap_width() || row.glyphs.len() == 1 {
return; // we are done return; // we are done
} }
@ -467,7 +463,7 @@ fn replace_last_glyph_with_overflow_character(
} }
// Check if we're within width budget: // Check if we're within width budget:
if row_width(row) <= job.wrap.max_width || row.glyphs.len() == 1 { if row_width(row) <= job.effective_wrap_width() || row.glyphs.len() == 1 {
return; // We are done return; // We are done
} }
@ -653,8 +649,8 @@ fn galley_from_rows(
// If the user picked a too aggressive wrap width (e.g. more narrow than any individual glyph), // If the user picked a too aggressive wrap width (e.g. more narrow than any individual glyph),
// we should let the user know. // we should let the user know.
} else { } else {
// Make sure we don't over the max wrap width the user picked: // Make sure we don't go over the max wrap width the user picked:
rect.max.x = rect.max.x.at_most(rect.min.x + job.wrap.max_width); rect.max.x = rect.max.x.at_most(rect.min.x + job.wrap.max_width).floor();
} }
} }

12
crates/epaint/src/text/text_layout_types.rs
View File

@ -175,6 +175,18 @@ impl LayoutJob {
} }
max_height max_height
} }
/// The wrap with, with a small margin in some cases.
pub fn effective_wrap_width(&self) -> f32 {
if self.round_output_size_to_nearest_ui_point {
// On a previous pass we may have rounded down by at most 0.5 and reported that as a width.
// egui may then set that width as the max width for subsequent frames, and it is important
// that we then don't wrap earlier.
self.wrap.max_width + 0.5
} else {
self.wrap.max_width
}
}
} }
impl std::hash::Hash for LayoutJob { impl std::hash::Hash for LayoutJob {