wip: save/restore ui window open state code cleanup

floooh · Dec 19, 2024 · 4abd3b6 · 4abd3b6
1 parent 5d7b19a
commit 4abd3b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/examples/common/ui.cc b/examples/common/ui.cc
@@ -328,7 +328,9 @@ static void imgui_ApplyAllFn(ImGuiContext* ctx, ImGuiSettingsHandler* handler) {
 static void imgui_WriteAllFn(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) {
     (void)ctx; (void)handler;
     if (state.save_settings_cb) {
-        ui_settings_t settings = state.save_settings_cb();
+        ui_settings_t settings;
+        ui_settings_init(&settings);
+        state.save_settings_cb(&settings);
         buf->reserve(buf->size() + settings.num_slots * 64);
         for (int i = 0; i < settings.num_slots; i++) {
             const ui_settings_slot_t* slot = &settings.slots[i];

diff --git a/examples/common/ui.h b/examples/common/ui.h
@@ -12,7 +12,7 @@ extern "C" {
 typedef uint64_t ui_texture_t;
 
 typedef void (*ui_draw_t)(void);
-typedef ui_settings_t (*ui_save_settings_t)(void);
+typedef void (*ui_save_settings_t)(ui_settings_t* settings);
 
 typedef struct {
     ui_draw_t draw_cb;

diff --git a/examples/sokol/atom.c b/examples/sokol/atom.c
@@ -60,7 +60,7 @@ static struct {
 
 #ifdef CHIPS_USE_UI
 static void ui_draw_cb(void);
-static ui_settings_t ui_save_settings_cb(void);
+static void ui_save_settings_cb(ui_settings_t* settings);
 static void ui_boot_cb(atom_t* sys);
 static void ui_save_snapshot(size_t slot_index);
 static bool ui_load_snapshot(size_t slot_index);
@@ -305,8 +305,8 @@ static void ui_draw_cb(void) {
     ui_atom_draw(&state.ui);
 }
 
-static ui_settings_t ui_save_settings_cb(void) {
-    return ui_atom_save_settings(&state.ui);
+static void ui_save_settings_cb(ui_settings_t* settings) {
+    ui_atom_save_settings(&state.ui, settings);
 }
 
 static void ui_boot_cb(atom_t* sys) {