Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

fix(ui): The font menu's filters don't keep every font loaded

moppeeerb2d8d3af7b3c
diff --git a/crates/ui-egui/src/panels/font_menu.rs b/crates/ui-egui/src/panels/font_menu.rs
index aa28f0318..7a50791c9 100644
--- a/crates/ui-egui/src/panels/font_menu.rs
+++ b/crates/ui-egui/src/panels/font_menu.rs
@@ -91,10 +91,12 @@ fn lock(kinds: &SharedKinds) -> std::sync::MutexGuard<'_, Kinds> {
kinds.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
}
-/// A family's kind, and whether its file was added within [`ADDED_WITHIN`].
+/// A family's kind, and whether its file was added within [`ADDED_WITHIN`]. Read without keeping
+/// the family loaded: the filters look at every installed family.
fn family_kind(fonts: &designcraft_fonts::ScopedFonts<'static>, family: &str) -> (FaceKind, bool) {
- let face = fonts.face(family, &regular(&fonts.styles(family)));
- (face.kind(), face.added().and_then(|t| t.elapsed().ok()).is_some_and(|age| age < ADDED_WITHIN))
+ fonts
+ .family_kind(family)
+ .map_or((FaceKind::default(), false), |(kind, added)| (kind, added.and_then(|t| t.elapsed().ok()).is_some_and(|age| age < ADDED_WITHIN)))
}
/// The families' kinds, starting to read them the first time they're needed for `scope`.