Skip to content

upd: fix font mgr logic #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Joezeo merged 1 commit into from
Jun 15, 2025
Merged

upd: fix font mgr logic #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tmui/src/font/mgr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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]
Expand Down