show login network errors through ui

src/client/mod.rs

@@ -21,6 +21,7 @@ pub use app::AppHandle;
 pub enum ClientEvent {
     Connect { send: NetSender, username: String },
     ServerMsg(ServerMsg),
+    Err(String),
 }
 
 pub struct Client {
@@ -34,6 +35,7 @@ pub struct Client {
     dir: DataDir,
     data: ClientData,
     handle: AppHandle,
+    error: Option<WidgetId<WidgetPtr>>,
 }
 
 impl Client {
@@ -52,6 +54,7 @@ impl Client {
             focus: None,
             username: "<unknown>".to_string(),
             clipboard: Clipboard::new().unwrap(),
+            error: None,
         };
         ui::init(&mut s);
         s
@@ -80,6 +83,11 @@ impl Client {
                     }
                 }
             },
+            ClientEvent::Err(msg) => {
+                if let Some(err) = &self.error {
+                    self.ui[err].inner = Some(ui::error(&mut self.ui, &msg));
+                }
+            }
         }
     }
 

src/client/ui.rs

@@ -27,7 +27,7 @@ pub fn init(client: &mut Client) {
     login_screen(client).set_root(&mut client.ui);
 }
 
-pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId<AnyWidget> {
+pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId {
     let msg_panel = msg_panel(client, network);
     let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
 
@@ -37,9 +37,22 @@ pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId<AnyWidget>
         .any()
 }
 
-fn login_screen(client: &mut Client) -> WidgetId<AnyWidget> {
+pub fn error(ui: &mut Ui, msg: &str) -> WidgetId {
+    text(msg)
+        .size(20)
+        .color(Color::RED.brighter(0.3))
+        .pad(10)
+        .add(ui)
+        .any()
+}
+
+fn login_screen(client: &mut Client) -> WidgetId {
     let Client {
-        ui, handle, data, ..
+        ui,
+        handle,
+        data,
+        error,
+        ..
     } = client;
 
     let mut field = |name| text(name).editable().size(20).add(ui);
@@ -69,7 +82,7 @@ fn login_screen(client: &mut Client) -> WidgetId<AnyWidget> {
             connect(handle.clone(), ConnectInfo { ip, username });
         })
         .height(40);
-    (
+    let modal = (
         text("login").size(30),
         fbx(ip
             .id_on(Edited, |id, client: &mut Client, _| {
@@ -89,9 +102,12 @@ fn login_screen(client: &mut Client) -> WidgetId<AnyWidget> {
         .pad(15)
         .background(rect(Color::BLACK.brighter(0.2)).radius(15))
         .width(400)
-        .align(Align::Center)
-        .add(ui)
-        .any()
+        .align(Align::Center);
+
+    let err = WidgetPtr::default().add(ui);
+    client.error = Some(err.clone());
+
+    (modal, err.align(Align::Top)).stack().add(ui).any()
 }
 
 pub fn msg_widget(msg: Msg) -> impl WidgetLike<FnTag> {