migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Simplify layout_multiline loop loop into a while loop

Browse Source
This commit is contained in:
Fishhh
2024-11-30 17:54:04 +01:00
parent 1be24ba470
commit fd8413c62a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,10 +736,9 @@ impl GalleyCache {
let mut current = 0; let mut current = 0;
let mut left_max_rows = job.wrap.max_rows; let mut left_max_rows = job.wrap.max_rows;
let mut galleys = Vec::new(); let mut galleys = Vec::new();
let mut text_left = job.text.as_str();
let mut first_row_min_height = job.first_row_min_height; let mut first_row_min_height = job.first_row_min_height;
loop { while current != job.text.len() {
let end = text_left let end = job.text[current..]
.find('\n') .find('\n')
.map_or(job.text.len(), |i| i + current + 1); .map_or(job.text.len(), |i| i + current + 1);
let start = current; let start = current;
@@ -791,11 +790,6 @@ impl GalleyCache {
galleys.push(galley); galleys.push(galley);
current = end; current = end;
if current >= job.text.len() {
break;
} else {
text_left = &job.text[current..];
}
} }
let mut merged_galley = Galley { let mut merged_galley = Galley {