Skip to content

Fix wrong galley split behavior when text ends with new line #7320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasmerlin merged 1 commit into from
Jul 9, 2025
Merged

Fix wrong galley split behavior when text ends with new line #7320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion crates/epaint/src/text/fonts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,9 +886,12 @@ impl GalleyCache {
let is_first_paragraph = start == 0;
// `end` will not include the `\n` since we don't want to create an empty row in our
// split galley
let end = job.text[start..]
let mut end = job.text[start..]
.find('\n')
.map_or(job.text.len(), |i| start + i);
if end == job.text.len() - 1 && job.text.ends_with('\n') {
end += 1; // If the text ends with a newline, we include it in the last paragraph.
}

let mut paragraph_job = LayoutJob {
text: job.text[start..end].to_owned(),
Expand Down Expand Up @@ -1083,6 +1086,12 @@ mod tests {
Color32::WHITE,
f32::INFINITY,
),
LayoutJob::simple(
"ends with newlines\n\n".to_owned(),
FontId::new(14.0, FontFamily::Monospace),
Color32::WHITE,
f32::INFINITY,
),
LayoutJob::simple(
"Simple test.".to_owned(),
FontId::new(14.0, FontFamily::Monospace),
Expand Down
Loading