git.lucas.co / cce-fonts
font browser

commit36938a5bf1a2eabeb1822e876af513e904810b6f
parent44d0320832
authorLucas Galante <[email protected]>
date2026-07-12 19:29
refactor: base() Option handling dropped (cce-ui flip part 1)

Element::base is guaranteed now — the map/map_or/if-let wrappers around a
base that always exists collapse to direct reads. Behavior-preserving.

Co-Authored-By: Claude Fable 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_018u7qTwzX95dd5ysAkaSCLk

 src/main.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8d535ee..070a64a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -263,18 +263,18 @@ impl TypefaceApp {
         unsafe {
             if !self.widgets_registered {
                 self.widgets_registered = true;
-                self.ui_context.register_widget(self.search_box.base().unwrap().id(), (*self_ptr).search_box.as_ptr_mut());
-                self.ui_context.register_widget(self.btn_open_folder.base().unwrap().id(), (*self_ptr).btn_open_folder.as_ptr_mut());
-                self.ui_context.register_widget(self.btn_remove_font.base().unwrap().id(), (*self_ptr).btn_remove_font.as_ptr_mut());
-                self.ui_context.register_widget(self.style_dropdown.base().unwrap().id(), (*self_ptr).style_dropdown.as_ptr_mut());
-                self.ui_context.register_widget(self.size_spinbox.base().unwrap().id(), (*self_ptr).size_spinbox.as_ptr_mut());
-                self.ui_context.register_widget(self.preview_box.base().unwrap().id(), (*self_ptr).preview_box.as_ptr_mut());
-                self.ui_context.register_widget(self.select_cancel_btn.base().unwrap().id(), (*self_ptr).select_cancel_btn.as_ptr_mut());
-                self.ui_context.register_widget(self.select_confirm_btn.base().unwrap().id(), (*self_ptr).select_confirm_btn.as_ptr_mut());
+                self.ui_context.register_widget(self.search_box.base().id(), (*self_ptr).search_box.as_ptr_mut());
+                self.ui_context.register_widget(self.btn_open_folder.base().id(), (*self_ptr).btn_open_folder.as_ptr_mut());
+                self.ui_context.register_widget(self.btn_remove_font.base().id(), (*self_ptr).btn_remove_font.as_ptr_mut());
+                self.ui_context.register_widget(self.style_dropdown.base().id(), (*self_ptr).style_dropdown.as_ptr_mut());
+                self.ui_context.register_widget(self.size_spinbox.base().id(), (*self_ptr).size_spinbox.as_ptr_mut());
+                self.ui_context.register_widget(self.preview_box.base().id(), (*self_ptr).preview_box.as_ptr_mut());
+                self.ui_context.register_widget(self.select_cancel_btn.base().id(), (*self_ptr).select_cancel_btn.as_ptr_mut());
+                self.ui_context.register_widget(self.select_confirm_btn.base().id(), (*self_ptr).select_confirm_btn.as_ptr_mut());
             }
             for btn in (*self_ptr).font_buttons.iter_mut() {
                 if btn.rect().0 > -9000.0 {
-                    self.ui_context.register_widget(btn.base().unwrap().id(), btn.as_ptr_mut());
+                    self.ui_context.register_widget(btn.base().id(), btn.as_ptr_mut());
                 }
             }
         }