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

Fix incorrect line breaks (#4377) 

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo cranky`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

While breaking a paragraph, it was possible to lose line break
candidates that could've been used on the next line, causing egui to
unnecessarily overrun `wrap.max_width`.

This PR fixes it so that we don't forget about those candidates.


Before:
Note that the window can't resize to the requested width because the
text is not wrapping.


https://github.com/emilk/egui/assets/1410520/6430a334-2995-4b40-bc34-8f01923f9f95

After:


https://github.com/emilk/egui/assets/1410520/225fa4cd-cbbb-4a7e-9580-7f1814c05ee7

---------

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
This commit is contained in:
Juan Campa 2024-04-21 04:58:40 -04:00 committed by GitHub
parent 79fbd17b33
commit c630a8de89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,7 @@ fn line_break(paragraph: &Paragraph, job: &LayoutJob, out_rows: &mut Vec<Row>, e
// Start a new row:
row_start_idx = last_kept_index + 1;
row_start_x = paragraph.glyphs[row_start_idx].pos.x;
row_break_candidates = Default::default();
row_break_candidates.forget_before_idx(row_start_idx);
} else {
// Found no place to break, so we have to overrun wrap_width.
}
@ -943,6 +943,35 @@ impl RowBreakCandidates {
.or(self.any)
}
}
fn forget_before_idx(&mut self, index: usize) {
let Self {
space,
cjk,
pre_cjk,
dash,
punctuation,
any,
} = self;
if space.map_or(false, |s| s < index) {
*space = None;
}
if cjk.map_or(false, |s| s < index) {
*cjk = None;
}
if pre_cjk.map_or(false, |s| s < index) {
*pre_cjk = None;
}
if dash.map_or(false, |s| s < index) {
*dash = None;
}
if punctuation.map_or(false, |s| s < index) {
*punctuation = None;
}
if any.map_or(false, |s| s < index) {
*any = None;
}
}
}
#[inline]