Fix font usage before loaded

Zerthox · Aug 11, 2024 · dc042ed · dc042ed
1 parent eea8388
commit dc042ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/addon/ui/mod.rs b/src/addon/ui/mod.rs
@@ -22,7 +22,7 @@ impl Addon {
 
     pub fn render_displays(&mut self, ui: &Ui) {
         if self.context.ui.should_show() || self.context.edit.is_editing() {
-            let _font = self.context.font.map(|font| font.push());
+            let _font = self.context.font.and_then(|font| font.push());
             for pack in &mut self.packs {
                 pack.render(ui, &self.context);
             }

diff --git a/src/elements/text/mod.rs b/src/elements/text/mod.rs
@@ -116,7 +116,7 @@ impl Render for Text {
         self.update(ctx, state);
 
         if let Some(text) = &self.text_memo {
-            let _font = self.loaded_font.map(|font| font.push());
+            let _font = self.loaded_font.and_then(|font| font.push());
             let font_scale = self.props.scale;
             let pos = self.calc_pos(ui, state.pos, text);
             let [r, g, b, a] = self.props.color;

diff --git a/src/render_util/font.rs b/src/render_util/font.rs
@@ -1,7 +1,7 @@
 use nexus::imgui::{sys, ComboBoxFlags, Selectable, SelectableFlags, Ui};
 use std::{
     borrow::Cow,
-    ffi::{c_char, CStr, CString},
+    ffi::{CStr, CString},
     ptr::NonNull,
     slice,
 };
@@ -38,29 +38,27 @@ impl Font {
         result
     }
 
-    pub unsafe fn name_ptr(&self) -> *const [c_char] {
-        let font = self.0.as_ref();
-        let config = font.ConfigData.as_ref().expect("font config is null");
-        config.Name.as_slice() as *const _
+    pub fn as_ptr(&self) -> *mut sys::ImFont {
+        self.0.as_ptr()
+    }
+
+    pub fn is_loaded(&self) -> bool {
+        unsafe { sys::ImFont_IsLoaded(self.as_ptr()) }
     }
 
     pub unsafe fn name_raw<'a>(&self) -> &'a CStr {
-        let name = self.name_ptr();
-        let bytes = (name as *const [u8]).as_ref().expect("font name is null");
-        CStr::from_bytes_until_nul(bytes).expect("font name without nul terminator")
+        CStr::from_ptr(sys::ImFont_GetDebugName(self.as_ptr()))
     }
 
     pub fn name_owned(&self) -> String {
         unsafe { self.name_raw() }.to_string_lossy().into_owned()
     }
 
-    pub fn as_ptr(&self) -> *mut sys::ImFont {
-        self.0.as_ptr()
-    }
-
-    pub fn push(&self) -> FontToken {
-        unsafe { sys::igPushFont(self.as_ptr()) }
-        FontToken
+    pub fn push(&self) -> Option<FontToken> {
+        self.is_loaded().then(|| {
+            unsafe { sys::igPushFont(self.as_ptr()) };
+            FontToken
+        })
     }
 }
 
@@ -93,7 +91,7 @@ pub fn font_select(ui: &Ui, label: impl AsRef<str>, current: &mut Option<Font>)
             let is_selected = Some(font) == *current;
             if unsafe {
                 sys::igSelectable_Bool(
-                    font.name_ptr().cast(),
+                    font.name_raw().as_ptr(),
                     is_selected,
                     SelectableFlags::empty().bits() as i32,
                     [0.0, 0.0].into(),