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 incorrect behavior with LayoutJob::max_rows

Browse Source
This commit is contained in:
Hubert Głuchowski
2024-12-05 19:15:23 +01:00
parent 40f237d43c
commit 17a5f1f75e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/epaint/src/text/fonts.rs
View File

@@ -849,8 +849,17 @@ impl GalleyCache {
// This will prevent us from invalidating cache entries unnecessarily // This will prevent us from invalidating cache entries unnecessarily
if left_max_rows != usize::MAX { if left_max_rows != usize::MAX {
left_max_rows -= galley.rows.len(); left_max_rows -= galley.rows.len();
// Ignore extra trailing row, see merging counterpart below for more details.
if end < job.text.len() && !galley.elided {
left_max_rows += 1;
}
} }
let elided = galley.elided;
galleys.push(galley); galleys.push(galley);
if elided {
break;
}
current = end; current = end;
} }
@@ -896,10 +905,9 @@ impl GalleyCache {
merged_galley.num_vertices += galley.num_vertices; merged_galley.num_vertices += galley.num_vertices;
merged_galley.num_indices += galley.num_indices; merged_galley.num_indices += galley.num_indices;
if galley.elided { // Note that if `galley.elided` is true this will be the last `Galley` in
merged_galley.elided = true; // the vector and the loop will end.
break; merged_galley.elided |= galley.elided;
}
} }
if merged_galley.job.round_output_size_to_nearest_ui_point { if merged_galley.job.round_output_size_to_nearest_ui_point {