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

Simplify the code slightly

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-03-28 12:38:55 +01:00
parent 3e89613dc1
commit 6f4732b068
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,7 +617,7 @@ pub struct FontsAndCache {
impl FontsAndCache { impl FontsAndCache {
fn layout_job(&mut self, job: LayoutJob) -> Arc<Galley> { fn layout_job(&mut self, job: LayoutJob) -> Arc<Galley> {
self.galley_cache.layout(&mut self.fonts, job) self.galley_cache.layout(&mut self.fonts, job, true)
} }
} }
@@ -737,7 +737,12 @@ struct GalleyCache {
} }
impl GalleyCache { impl GalleyCache {
fn layout(&mut self, fonts: &mut FontsImpl, mut job: LayoutJob) -> Arc<Galley> { fn layout(
&mut self,
fonts: &mut FontsImpl,
mut job: LayoutJob,
allow_split_paragraphs: bool,
) -> Arc<Galley> {
if job.wrap.max_width.is_finite() { if job.wrap.max_width.is_finite() {
// Protect against rounding errors in egui layout code. // Protect against rounding errors in egui layout code.
@@ -767,12 +772,13 @@ impl GalleyCache {
match self.cache.entry(hash) { match self.cache.entry(hash) {
std::collections::hash_map::Entry::Occupied(entry) => { std::collections::hash_map::Entry::Occupied(entry) => {
// The job was found in cache - no need to re-layout.
let cached = entry.into_mut(); let cached = entry.into_mut();
cached.last_used = self.generation; cached.last_used = self.generation;
cached.galley.clone() cached.galley.clone()
} }
std::collections::hash_map::Entry::Vacant(entry) => { std::collections::hash_map::Entry::Vacant(entry) => {
if should_cache_each_paragraph_individually(&job) { if allow_split_paragraphs && should_cache_each_paragraph_individually(&job) {
let galley = self.layout_multiline(fonts, job); let galley = self.layout_multiline(fonts, job);
let galley = Arc::new(galley); let galley = Arc::new(galley);
self.cache.insert( self.cache.insert(
@@ -808,7 +814,7 @@ impl GalleyCache {
.map_or(job.text.len(), |i| i + current + 1); .map_or(job.text.len(), |i| i + current + 1);
let start = current; let start = current;
let mut line_job = LayoutJob { let mut paragraph_job = LayoutJob {
text: job.text[current..end].to_string(), text: job.text[current..end].to_string(),
wrap: crate::text::TextWrapping { wrap: crate::text::TextWrapping {
max_rows: left_max_rows, max_rows: left_max_rows,
@@ -832,7 +838,7 @@ impl GalleyCache {
debug_assert!(s.byte_range.contains(&current), "Bug in LayoutJob splitter"); debug_assert!(s.byte_range.contains(&current), "Bug in LayoutJob splitter");
let section_end = s.byte_range.end.min(end); let section_end = s.byte_range.end.min(end);
line_job.sections.push(crate::text::LayoutSection { paragraph_job.sections.push(crate::text::LayoutSection {
// Leading space should only be added to the first section // Leading space should only be added to the first section
// if the there are multiple sections that will be created // if the there are multiple sections that will be created
// from splitting the current section. // from splitting the current section.
@@ -847,7 +853,7 @@ impl GalleyCache {
current = section_end; current = section_end;
} }
let galley = self.layout_component_line(fonts, line_job); let galley = self.layout(fonts, paragraph_job, false);
// This will prevent us from invalidating cache entries unnecessarily // This will prevent us from invalidating cache entries unnecessarily
if left_max_rows != usize::MAX { if left_max_rows != usize::MAX {
left_max_rows -= galley.rows.len(); left_max_rows -= galley.rows.len();
@@ -869,27 +875,6 @@ impl GalleyCache {
concat_galleys(job, &galleys, fonts.pixels_per_point) concat_galleys(job, &galleys, fonts.pixels_per_point)
} }
fn layout_component_line(&mut self, fonts: &mut FontsImpl, job: LayoutJob) -> Arc<Galley> {
let hash = crate::util::hash(&job);
match self.cache.entry(hash) {
std::collections::hash_map::Entry::Occupied(entry) => {
let cached = entry.into_mut();
cached.last_used = self.generation;
cached.galley.clone()
}
std::collections::hash_map::Entry::Vacant(entry) => {
let galley = super::layout(fonts, job.into());
let galley = Arc::new(galley);
entry.insert(CachedGalley {
last_used: self.generation,
galley: galley.clone(),
});
galley
}
}
}
pub fn num_galleys_in_cache(&self) -> usize { pub fn num_galleys_in_cache(&self) -> usize {
self.cache.len() self.cache.len()
} }