better global state structure?

src/bin/test/main.rs

@@ -1,36 +1,26 @@
 use cosmic_text::Family;
 use std::{cell::RefCell, rc::Rc};
-use winit::{event::WindowEvent, event_loop::ActiveEventLoop, window::WindowAttributes};
+use winit::event::WindowEvent;
 
-iris::state_prelude!(DefaultUiRsc<Client>);
+iris::state_prelude!(ClientRsc);
 
 fn main() {
     App::<Client>::run();
 }
 
+#[default_ui_state]
 pub struct Client {
-    rsc: DefaultUiRsc<Self>,
     info: WidgetRef<Text>,
 }
 
-impl HasRsc for Client {
-    type Rsc = DefaultUiRsc<Self>;
-
-    fn rsc(&self) -> &Self::Rsc {
-        &self.rsc
-    }
-
-    fn rsc_mut(&mut self) -> &mut Self::Rsc {
-        &mut self.rsc
-    }
-}
-
 impl DefaultAppState for Client {
-    fn new(event_loop: &ActiveEventLoop, _proxy: Proxy<Self::Event>) -> Self {
-        let window = event_loop
-            .create_window(WindowAttributes::default())
-            .unwrap();
-        let mut rsc = DefaultUiRsc::new(window);
+    fn new(ui_state: DefaultUiState, _proxy: Proxy<Self::Event>) -> Self {
+        let mut rsc = ClientRsc {
+            ui: Ui::new(),
+            ui_state,
+            events: EventManager::default(),
+        };
+
         let info;
         let rrect = rect(Color::WHITE).radius(20);
         let pad_test = (
@@ -71,19 +61,19 @@ impl DefaultAppState for Client {
 
         let add_button = rect(Color::LIME)
             .radius(30)
-            .on(CursorSense::click(), move |mut ctx| {
+            .on(CursorSense::click(), move |ctx| {
                 let child = image(include_bytes!("assets/sungals.png"))
                     .center()
-                    .add(&mut ctx.state.rsc);
-                ctx[span_add.r].children.push(child);
+                    .add(ctx.state);
+                (span_add.r)(ctx).children.push(child);
             })
             .sized((150, 150))
             .align(Align::BOT_RIGHT);
 
         let del_button = rect(Color::RED)
             .radius(30)
-            .on(CursorSense::click(), move |mut ctx| {
-                ctx[span_add.r].children.pop();
+            .on(CursorSense::click(), move |ctx| {
+                (span_add.r)(ctx).children.pop();
             })
             .sized((150, 150))
             .align(Align::BOT_LEFT);
@@ -120,8 +110,9 @@ impl DefaultAppState for Client {
             .text_align(Align::LEFT)
             .size(30)
             .attr::<Selectable>(())
-            .on(Submit, move |mut ctx| {
-                let content = ctx.widget.edit(ctx.state.ui()).take();
+            .on(Submit, move |ctx| {
+                let w = ctx.widget;
+                let content = w.edit(ctx).take();
                 let text = wtext(content)
                     .editable(EditMode::MultiLine)
                     .size(30)
@@ -130,8 +121,8 @@ impl DefaultAppState for Client {
                     .attr::<Selectable>(());
                 let msg_box = text
                     .background(rect(Color::WHITE.darker(0.5)))
-                    .add(&mut ctx.state.rsc);
-                ctx[texts.r].children.push(msg_box);
+                    .add(ctx.state);
+                (texts.r)(ctx).children.push(msg_box);
             })
             .handles(&mut rsc);
         let text_edit_scroll = (
@@ -171,21 +162,21 @@ impl DefaultAppState for Client {
             }
             let vals = vals.clone();
             let rect = rect(color)
-                .on(CursorSense::click(), move |mut ctx| {
+                .on(CursorSense::click(), move |ctx| {
                     let (prev, vec) = &mut *vals.borrow_mut();
                     if let Some(h) = vec[i].take() {
-                        vec[*prev] = ctx[main.r].replace(h);
+                        vec[*prev] = (main.r)(ctx).replace(h);
                         *prev = i;
                     }
                     ctx.widget().color = color.darker(0.3);
                 })
                 .on(
                     CursorSense::HoverStart | CursorSense::unclick(),
-                    move |mut ctx| {
+                    move |ctx| {
                         ctx.widget().color = color.brighter(0.2);
                     },
                 )
-                .on(CursorSense::HoverEnd, move |mut ctx| {
+                .on(CursorSense::HoverEnd, move |ctx| {
                     ctx.widget().color = color;
                 });
             (rect, wtext(label).size(30).text_align(Align::CENTER)).stack()
@@ -211,21 +202,26 @@ impl DefaultAppState for Client {
             .stack()
             .set_root(&mut rsc);
 
-        Self { rsc, info: info.r }
+        Self {
+            ui: rsc.ui,
+            ui_state: rsc.ui_state,
+            events: rsc.events,
+            info: info.r,
+        }
     }
 
     fn window_event(&mut self, _: WindowEvent) {
         let new = format!(
             "widgets: {}\nactive:{}\nviews: {}",
-            self.ui().num_widgets(),
-            self.ui().active_widgets(),
-            self.ui_state().renderer.ui.view_count()
+            self.ui.num_widgets(),
+            self.ui.active_widgets(),
+            self.ui_state.renderer.ui.view_count()
         );
-        if new != *self.rsc.ui[self.info].content {
-            *self.rsc.ui[self.info].content = new;
+        if new != *self.ui[self.info].content {
+            *self.ui[self.info].content = new;
         }
-        if self.ui().needs_redraw() {
-            self.ui_state().window.request_redraw();
+        if self.ui.needs_redraw() {
+            self.ui_state.window.request_redraw();
         }
     }
 }