From fb0b5e31824a0a6f611b883cf69ff9b47adcf8e9 Mon Sep 17 00:00:00 2001 From: JoeZane Date: Sun, 15 Jun 2025 19:06:51 +0800 Subject: [PATCH] upd: fix font mgr logic --- tmui/src/font/mgr.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tmui/src/font/mgr.rs b/tmui/src/font/mgr.rs index 0834cd5..dd27438 100644 --- a/tmui/src/font/mgr.rs +++ b/tmui/src/font/mgr.rs @@ -50,11 +50,11 @@ lazy_static! { impl FontManager { #[inline] pub(crate) fn load_fonts() { - #[cfg(font_awesome)] - { - MGR.with(|mgr| { - let mut manager = mgr.borrow_mut(); + MGR.with(|mgr| { + let mut manager = mgr.borrow_mut(); + #[cfg(font_awesome)] + { for font in EXTERNAL_FONTS { let data = FontAsset::get(font) .unwrap_or_else(|| panic!("Load ttf file `{}` failed.", font)) @@ -71,12 +71,12 @@ impl FontManager { manager.fonts.insert(tf.family_name(), tf); } + } - if let Some(f) = FONT_LOADER.lock().as_ref() { - f(&mut manager) - } - }) - } + if let Some(f) = FONT_LOADER.lock().as_ref() { + f(&mut manager) + } + }) } #[inline]