Persist window state across runs

src/window/vip/object.rs

@@ -5,6 +5,7 @@ use egui::{
     TextureOptions, Ui, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
+use serde::{Deserialize, Serialize};
 
 use crate::{
     emulator::SimId,
@@ -12,40 +13,56 @@ use crate::{
     memory::{MemoryClient, MemoryView},
     window::{
         AppWindow,
-        utils::{NumberEdit, UiExt as _},
+        utils::{NumberEdit, UiData, UiExt as _},
     },
 };
 
 use super::utils::{self, Object};
 
+#[derive(Clone, PartialEq, Serialize, Deserialize)]
+struct State {
+    index: usize,
+    generic_palette: bool,
+    scale: f32,
+}
+impl Default for State {
+    fn default() -> Self {
+        Self {
+            index: 0,
+            generic_palette: false,
+            scale: 1.0,
+        }
+    }
+}
+
 pub struct ObjectWindow {
     sim_id: SimId,
     memory: Arc<MemoryClient>,
     objects: MemoryView,
-    index: usize,
-    generic_palette: bool,
     params: ImageParams<ObjectParams>,
-    scale: f32,
+    state: UiData<State>,
 }
 
 impl ObjectWindow {
     pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
-        let initial_params = ObjectParams {
-            index: 0,
-            generic_palette: false,
-            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-        };
+        let state: UiData<State> = UiData::new();
         let renderer = ObjectRenderer::new(sim_id, memory);
-        let params = images.add(sim_id, renderer, initial_params);
+        let params = images.add(
+            sim_id,
+            renderer,
+            ObjectParams {
+                index: state.index,
+                generic_palette: state.generic_palette,
+                left_color: Color32::from_rgb(0xff, 0x00, 0x00),
+                right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
+            },
+        );
         Self {
             sim_id,
             memory: memory.clone(),
             objects: memory.watch(sim_id, 0x0003e000, 0x2000),
-            index: params.index,
-            generic_palette: params.generic_palette,
             params,
-            scale: 1.0,
+            state,
         }
     }
 
@@ -61,7 +78,7 @@ impl ObjectWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.index).range(0..1024));
+                            ui.add(NumberEdit::new(&mut self.state.index).range(0..1024));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -69,7 +86,7 @@ impl ObjectWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = 0x3e000 + self.index * 8;
+                            let address = 0x3e000 + self.state.index * 8;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -83,7 +100,7 @@ impl ObjectWindow {
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
             ui.section("Properties", |ui| {
-                let mut object = self.objects.borrow().read::<[u16; 4]>(self.index);
+                let mut object = self.objects.borrow().read::<[u16; 4]>(self.state.index);
                 let mut obj = Object::parse(object);
                 TableBuilder::new(ui)
                     .column(Column::remainder())
@@ -158,7 +175,7 @@ impl ObjectWindow {
                         });
                     });
                 if obj.update(&mut object) {
-                    let address = 0x3e000 + self.index * 8;
+                    let address = 0x3e000 + self.state.index * 8;
                     self.memory.write(self.sim_id, address as u32, &object);
                 }
             });
@@ -166,24 +183,24 @@ impl ObjectWindow {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
                 });
-                ui.checkbox(&mut self.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.state.generic_palette, "Generic palette");
             });
         });
         self.params.write(ObjectParams {
-            index: self.index,
-            generic_palette: self.generic_palette,
+            index: self.state.index,
+            generic_palette: self.state.generic_palette,
             ..*self.params
         });
     }
 
     fn show_object(&mut self, ui: &mut Ui) {
         let image = Image::new(self.image_url("object-full"))
-            .fit_to_original_size(self.scale)
+            .fit_to_original_size(self.state.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
     }
@@ -201,6 +218,7 @@ impl AppWindow for ObjectWindow {
     }
 
     fn show(&mut self, ui: &mut Ui) {
+        self.state.load(ui);
         CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
@@ -216,6 +234,7 @@ impl AppWindow for ObjectWindow {
                     });
             });
         });
+        self.state.save(ui);
     }
 }