djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash in text layout (#1468)

Browse source 
Fix text layout bug added in https://github.com/emilk/egui/pull/1291
This commit is contained in:
Emil Ernerfeldt 2022-04-09 22:43:40 +02:00 committed by GitHub
parent cf0338d48f
commit c2ab0404b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
epaint/src/text/text_layout.rs
View file

@ -249,7 +249,7 @@ fn line_break(
} }
if row_start_idx < paragraph.glyphs.len() { if row_start_idx < paragraph.glyphs.len() {
if non_empty_rows == job.wrap.max_rows { if job.wrap.max_rows > 0 && non_empty_rows == job.wrap.max_rows {
if let Some(last_row) = out_rows.last_mut() { if let Some(last_row) = out_rows.last_mut() {
replace_last_glyph_with_overflow_character(fonts, job, last_row); replace_last_glyph_with_overflow_character(fonts, job, last_row);
} }
@ -773,3 +773,14 @@ fn is_chinese(c: char) -> bool {
|| ('\u{3400}' <= c && c <= '\u{4DBF}') || ('\u{3400}' <= c && c <= '\u{4DBF}')
|| ('\u{2B740}' <= c && c <= '\u{2B81F}') || ('\u{2B740}' <= c && c <= '\u{2B81F}')
} }
// ----------------------------------------------------------------------------
#[test]
fn test_zero_max_width() {
let mut fonts = FontsImpl::new(1.0, 1024, super::FontDefinitions::default());
let mut layout_job = LayoutJob::single_section("W".into(), super::TextFormat::default());
layout_job.wrap.max_width = 0.0;
let galley = super::layout(&mut fonts, layout_job.into());
assert_eq!(galley.rows.len(), 1);
}