update iris

src/bin/client/main.rs

@@ -16,6 +16,7 @@ use winit::{
     window::WindowAttributes,
 };
 
+mod account;
 mod debug;
 mod net;
 mod rsc;
@@ -24,7 +25,7 @@ mod ui;
 
 fn main() {
     install_crypto_provider();
-    UiApp::<Client>::run();
+    DefaultApp::<Client>::run();
 }
 
 pub struct Client {
@@ -33,7 +34,6 @@ pub struct Client {
     state: ClientState,
     main_ui: WidgetId<WidgetPtr>,
     notif: WidgetId<WidgetPtr>,
-    ui: DefaultUi,
     proxy: Proxy<ClientEvent>,
 }
 
@@ -43,27 +43,23 @@ pub enum ClientEvent {
     Err(String),
 }
 
-impl DefaultUiState for Client {
+impl DefaultAppState for Client {
     type Event = ClientEvent;
 
-    fn ui(&mut self) -> &mut DefaultUi {
-        &mut self.ui
-    }
-
     fn window_attrs() -> WindowAttributes {
         WindowAttributes::default().with_title("OPENWORM")
     }
 
-    fn new(mut ui: DefaultUi, proxy: Proxy<Self::Event>) -> Self {
+    fn new(ui: &mut Ui, state: &UiState, proxy: Proxy<Self::Event>) -> Self {
         let dir = DataDir::default();
-        let notif = WidgetPtr::default().add(&mut ui);
-        let main_ui = WidgetPtr::default().add(&mut ui);
+        let notif = WidgetPtr::default().add(ui);
+        let main_ui = WidgetPtr::default().add(ui);
         (
             notif.clone().pad(Padding::top(10)).align(Align::TOP_CENTER),
             main_ui.clone(),
         )
             .stack()
-            .set_root(&mut ui);
+            .set_root(ui);
 
         let mut s = Self {
             data: dir.load(CLIENT_DATA),
@@ -71,14 +67,13 @@ impl DefaultUiState for Client {
             dir,
             main_ui: main_ui.clone(),
             notif,
-            ui,
             proxy,
         };
-        connect_screen(&mut s).set_ptr(&s.main_ui, &mut s.ui);
+        connect_screen(&mut s, ui, state).set_ptr(&s.main_ui, ui);
         s
     }
 
-    fn event(&mut self, event: ClientEvent) {
+    fn event(&mut self, event: ClientEvent, ui: &mut Ui, _state: &UiState) {
         match event {
             ClientEvent::Connect { send } => {
                 let ClientState::Connect(connect) = self.state.take() else {
@@ -91,15 +86,15 @@ impl DefaultUiState for Client {
                         thread: th,
                     },
                 });
-                login_screen(self).set_ptr(&self.main_ui, &mut self.ui);
+                login_screen(self, ui).set_ptr(&self.main_ui, ui);
             }
             ClientEvent::ServerMsg(msg) => match msg {
                 ServerMsg::SendMsg(msg) => {
                     if let ClientState::LoggedIn(state) = &mut self.state
                         && let Some(msg_area) = &state.channel
                     {
-                        let msg = msg_widget(&msg.user, &msg.content).add(&mut self.ui);
-                        self.ui[msg_area].children.push(msg.any());
+                        let msg = msg_widget(&msg.user, &msg.content).add(ui);
+                        ui[msg_area].children.push(msg.any());
                     }
                 }
                 ServerMsg::LoadMsgs(msgs) => {
@@ -108,8 +103,8 @@ impl DefaultUiState for Client {
                     {
                         for msg in msgs {
                             state.msgs.push(msg.clone());
-                            let msg = msg_widget(&msg.user, &msg.content).add(&mut self.ui);
-                            self.ui[msg_area].children.push(msg.any());
+                            let msg = msg_widget(&msg.user, &msg.content).add(ui);
+                            ui[msg_area].children.push(msg.any());
                         }
                     }
                 }
@@ -124,32 +119,32 @@ impl DefaultUiState for Client {
                         msgs: Vec::new(),
                         username,
                     });
-                    main_view(self).set_ptr(&self.main_ui, &mut self.ui);
+                    main_view(self, ui).set_ptr(&self.main_ui, ui);
                 }
                 ServerMsg::Error(error) => {
                     let msg = format!("{error:?}");
-                    self.ui[&self.notif].inner = Some(werror(&mut self.ui, &msg));
+                    ui[&self.notif].inner = Some(werror(ui, &msg));
                 }
             },
             ClientEvent::Err(msg) => {
-                self.ui[&self.notif].inner = Some(werror(&mut self.ui, &msg));
+                ui[&self.notif].inner = Some(werror(ui, &msg));
             }
         }
     }
 
-    fn exit(&mut self) {
+    fn exit(&mut self, _ui: &mut Ui, _state: &UiState) {
         self.state.exit();
         self.dir.save(CLIENT_DATA, &self.data);
     }
 
-    fn window_event(&mut self, event: WindowEvent) {
+    fn window_event(&mut self, event: WindowEvent, ui: &mut Ui, state: &UiState) {
         if let WindowEvent::MouseInput {
             state: ElementState::Pressed,
             button: MouseButton::Middle,
             ..
         } = event
         {
-            debug::debug(self);
+            debug::debug(self, ui, state);
         }
     }
 }