update iris & get button working again

src/bin/client/main.rs

@@ -11,7 +11,10 @@ use openworm::{
     net::{ClientMsg, ServerMsg, install_crypto_provider},
     rsc::DataDir,
 };
-use winit::event::{ElementState, MouseButton, WindowEvent};
+use winit::{
+    event::{ElementState, MouseButton, WindowEvent},
+    window::WindowAttributes,
+};
 
 mod account;
 mod debug;
@@ -31,8 +34,8 @@ pub struct Client {
     dir: DataDir,
     data: ClientData,
     state: ClientState,
-    main_ui: WidgetRef<WidgetPtr>,
-    notif: WidgetRef<WidgetPtr>,
+    main_ui: WeakWidget<WidgetPtr>,
+    notif: WeakWidget<WidgetPtr>,
     proxy: Proxy<ClientEvent>,
 }
 
@@ -48,7 +51,7 @@ impl DefaultAppState for Client {
     type Event = ClientEvent;
 
     fn new(
-        ui_state: DefaultUiState,
+        mut ui_state: DefaultUiState,
         rsc: &mut DefaultRsc<Self>,
         proxy: Proxy<Self::Event>,
     ) -> Self {
@@ -67,9 +70,9 @@ impl DefaultAppState for Client {
             notif.pad(Padding::top(10)).align(Align::TOP_CENTER),
         )
             .stack()
-            .set_root(rsc);
+            .set_root(rsc, &mut ui_state);
 
-        main_view(rsc).set_ptr(main_ui, rsc);
+        start_ui(rsc).set_ptr(main_ui, rsc);
 
         Self {
             ui_state,
@@ -82,7 +85,12 @@ impl DefaultAppState for Client {
         }
     }
 
-    fn event(&mut self, event: Self::Event, rsc: &mut DefaultRsc<Self>) {
+    fn event(
+        &mut self,
+        event: Self::Event,
+        rsc: &mut DefaultRsc<Self>,
+        _render: &mut UiRenderState,
+    ) {
         match event {
             ClientEvent::Connect { send } => {
                 let ClientState::Connect(connect) = self.state.take() else {
@@ -103,7 +111,7 @@ impl DefaultAppState for Client {
                         && let Some(msg_area) = state.channel
                     {
                         let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
-                        rsc.ui[msg_area].children.push(msg);
+                        rsc[msg_area].children.push(msg);
                     }
                 }
                 ServerMsg::LoadMsgs(msgs) => {
@@ -113,7 +121,7 @@ impl DefaultAppState for Client {
                         for msg in msgs {
                             state.msgs.push(msg.clone());
                             let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
-                            rsc.ui[msg_area].children.push(msg);
+                            rsc[msg_area].children.push(msg);
                         }
                     }
                 }
@@ -132,28 +140,37 @@ impl DefaultAppState for Client {
                 }
                 ServerMsg::Error(error) => {
                     let msg = format!("{error:?}");
-                    rsc.ui[self.notif].inner = Some(werror(&msg, rsc));
+                    rsc[self.notif].inner = Some(werror(&msg, rsc));
                 }
             },
             ClientEvent::Err(msg) => {
-                rsc.ui[self.notif].inner = Some(werror(&msg, rsc));
+                rsc[self.notif].inner = Some(werror(&msg, rsc));
             }
         }
     }
 
-    fn exit(&mut self, _: &mut DefaultRsc<Self>) {
+    fn exit(&mut self, _rsc: &mut DefaultRsc<Self>, _render: &mut UiRenderState) {
         self.state.exit();
         self.dir.save(CLIENT_DATA, &self.data);
     }
 
-    fn window_event(&mut self, event: WindowEvent, rsc: &mut DefaultRsc<Self>) {
+    fn window_event(
+        &mut self,
+        event: WindowEvent,
+        rsc: &mut DefaultRsc<Self>,
+        render: &mut UiRenderState,
+    ) {
         if let WindowEvent::MouseInput {
             state: ElementState::Pressed,
             button: MouseButton::Middle,
             ..
         } = event
         {
-            self.debug(rsc);
+            self.debug(rsc, render);
         }
     }
+
+    fn window_attributes() -> WindowAttributes {
+        WindowAttributes::default().with_title("OPENWORM")
+    }
 }