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

Correctly handle empty lines

Browse Source
This commit is contained in:
Fishhh
2024-11-30 15:59:50 +01:00
parent bc86bec1cb
commit abbc561ae1
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -772,6 +772,20 @@ impl GalleyCache {
current = section_end; current = section_end;
} }
// If the current line is empty, add an extra offset to make sure it's not omitted
// because the resulting galley will have a height of zero.
let extra_y_offset = if start == end && end != job.text.len() {
while job.sections[current_section].byte_range.end == end {
current_section += 1;
}
let format = &job.sections[current_section].format;
format
.line_height
.unwrap_or(fonts.row_height(&format.font_id))
} else {
0.0
};
// Prevent an infinite recursion // Prevent an infinite recursion
line_job.break_on_newline = false; line_job.break_on_newline = false;
@@ -780,7 +794,7 @@ impl GalleyCache {
if left_max_rows != usize::MAX { if left_max_rows != usize::MAX {
left_max_rows -= galley.rows.len(); left_max_rows -= galley.rows.len();
} }
galleys.push(galley); galleys.push((galley, extra_y_offset));
current = end + 1; current = end + 1;
if current >= job.text.len() { if current >= job.text.len() {
@@ -801,7 +815,7 @@ impl GalleyCache {
pixels_per_point: fonts.pixels_per_point, pixels_per_point: fonts.pixels_per_point,
}; };
for galley in galleys { for (galley, extra_y_offset) in galleys {
let current_offset = emath::vec2(0.0, merged_galley.rect.height()); let current_offset = emath::vec2(0.0, merged_galley.rect.height());
merged_galley merged_galley
.rows .rows
@@ -823,6 +837,7 @@ impl GalleyCache {
merged_galley.rect = merged_galley merged_galley.rect = merged_galley
.rect .rect
.union(galley.rect.translate(current_offset)); .union(galley.rect.translate(current_offset));
merged_galley.rect.max.y += extra_y_offset;
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 { if galley.elided {