login fn

src/client/ui.rs

@@ -24,13 +24,20 @@ pub fn ui(handle: AppHandle) -> (Ui, UiData) {
     let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
     let main_view = (side_bar, msg_panel).span(Dir::RIGHT).add(&mut ui).any();
 
+    login_screen(&mut ui, handle).set_root(&mut ui);
+
+    let data = UiData { main_view };
+    (ui, data)
+}
+
+fn login_screen(ui: &mut Ui, handle: AppHandle) -> WidgetId<AnyWidget> {
     let field = |name| text(name).editable().size(20);
     let ip = field("ip");
     // let username = field("username");
     // let password = field("password");
 
     let mut fbx = |field: TextBuilder<TextEditOutput>| {
-        let field = field.add(&mut ui);
+        let field = field.add(ui);
         field
             .clone()
             .pad(10)
@@ -46,7 +53,7 @@ pub fn ui(handle: AppHandle) -> (Ui, UiData) {
             connect(handle.clone());
         })
         .height(40);
-    let login = (
+    (
         text("login").size(30),
         fbx(ip),
         // fbx(username),
@@ -58,14 +65,12 @@ pub fn ui(handle: AppHandle) -> (Ui, UiData) {
         .pad(15)
         .background(rect(Color::BLACK.brighter(0.2)).radius(15))
         .width(400)
-        .align(Align::Center);
-    login.set_root(&mut ui);
-
-    let data = UiData { main_view };
-    (ui, data)
+        .align(Align::Center)
+        .add(ui)
+        .any()
 }
 
-pub fn msg_widget(content: String) -> impl WidgetLike<FnTag> {
+fn msg_widget(content: String) -> impl WidgetLike<FnTag> {
     let content = text(content)
         .editable()
         .size(20)