migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 13:50:04 -04:00
Code Activity

Respect first_row_min_height during multiline Galley layout

Browse Source
This commit is contained in:
Fishhh
2024-11-30 16:46:49 +01:00
parent abbc561ae1
commit 6d6bc3befb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,6 +733,7 @@ impl GalleyCache {
let mut left_max_rows = job.wrap.max_rows; let mut left_max_rows = job.wrap.max_rows;
let mut galleys = Vec::new(); let mut galleys = Vec::new();
let mut text_left = job.text.as_str(); let mut text_left = job.text.as_str();
let mut first_row_min_height = job.first_row_min_height;
loop { loop {
let end = text_left.find('\n').map_or(job.text.len(), |i| i + current); let end = text_left.find('\n').map_or(job.text.len(), |i| i + current);
let start = current; let start = current;
@@ -743,10 +744,15 @@ impl GalleyCache {
max_rows: left_max_rows, max_rows: left_max_rows,
..job.wrap ..job.wrap
}, },
sections: Vec::new(),
// Prevent an infinite recursion
break_on_newline: false,
halign: job.halign, halign: job.halign,
justify: job.justify, justify: job.justify,
..Default::default() first_row_min_height,
round_output_size_to_nearest_ui_point: job.round_output_size_to_nearest_ui_point,
}; };
first_row_min_height = 0.0;
while current < end { while current < end {
let mut s = &job.sections[current_section]; let mut s = &job.sections[current_section];
@@ -786,9 +792,6 @@ impl GalleyCache {
0.0 0.0
}; };
// Prevent an infinite recursion
line_job.break_on_newline = false;
let galley = self.layout(fonts, line_job); let galley = self.layout(fonts, line_job);
// 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 {