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

code cleanup

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-03-28 15:54:04 +01:00
parent 47f916ca80
commit 46ef7a1159
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -816,13 +816,13 @@ impl GalleyCache {
while current < job.text.len() { while current < job.text.len() {
let is_first_paragraph = current == 0; let is_first_paragraph = current == 0;
let end = job.text[current..]
.find('\n')
.map_or(job.text.len(), |i| current + i + 1);
let start = current; let start = current;
let end = job.text[start..]
.find('\n')
.map_or(job.text.len(), |i| start + i + 1);
let mut paragraph_job = LayoutJob { let mut paragraph_job = LayoutJob {
text: job.text[current..end].to_owned(), text: job.text[start..end].to_owned(),
wrap: crate::text::TextWrapping { wrap: crate::text::TextWrapping {
max_rows: max_rows_remaining, max_rows: max_rows_remaining,
..job.wrap ..job.wrap
@@ -993,7 +993,13 @@ mod tests {
fn jobs() -> Vec<LayoutJob> { fn jobs() -> Vec<LayoutJob> {
vec![ vec![
LayoutJob::simple( LayoutJob::simple(
"Simplest test.".to_owned(), String::default(),
FontId::new(14.0, FontFamily::Monospace),
Color32::WHITE,
f32::INFINITY,
),
LayoutJob::simple(
"Simple test.".to_owned(),
FontId::new(14.0, FontFamily::Monospace), FontId::new(14.0, FontFamily::Monospace),
Color32::WHITE, Color32::WHITE,
f32::INFINITY, f32::INFINITY,
@@ -1020,7 +1026,7 @@ mod tests {
}, },
); );
job.append( job.append(
"The second paragraph has underline and strikthrough, and has some non-ASCII characters: ÅÄÖ.", "The second paragraph has underline and strikthrough, and has some non-ASCII characters:\n ÅÄÖ.",
0.0, 0.0,
TextFormat { TextFormat {
font_id: FontId::new(15.0, FontFamily::Monospace), font_id: FontId::new(15.0, FontFamily::Monospace),
@@ -1030,7 +1036,7 @@ mod tests {
}, },
); );
job.append( job.append(
"The last paragraph is kind of boring, bust has italics.", "The last paragraph is kind of boring, but has italics.\nAnd a newline",
0.0, 0.0,
TextFormat { TextFormat {
font_id: FontId::new(10.0, FontFamily::Proportional), font_id: FontId::new(10.0, FontFamily::Proportional),