From 0c707c62d10e6e7863b46f1c304486b4be779e93 Mon Sep 17 00:00:00 2001
From: shadow cat <shadowcatzero@protonmail.com>
Date: Thu, 20 Nov 2025 15:44:30 -0500
Subject: [PATCH] the great orientation refactor (move to x & y
 UiScalars/Spans) + don't call full size in align

---
 src/bin/client/ui.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/bin/client/ui.rs b/src/bin/client/ui.rs
index 17b9ccf..9efe1b4 100644
--- a/src/bin/client/ui.rs
+++ b/src/bin/client/ui.rs
@@ -97,30 +97,31 @@ fn login_screen(client: &mut Client) -> WidgetId {
         .pad(15)
         .background(rect(Color::BLACK.brighter(0.2)).radius(15))
         .width(400)
-        .align(Align::Center);
+        .align(Align::CENTER);
 
     let err = WidgetPtr::default().add(ui);
     client.error = Some(err.clone());
 
-    (modal, err.align(Align::Top)).stack().add(ui).any()
+    (modal, err.align(Align::TOP_CENTER)).stack().add(ui).any()
 }
 
 pub fn msg_widget(msg: Msg) -> impl WidgetLike<FnTag> {
     let content = text(msg.content)
         .editable()
         .size(20)
-        .text_align(Align::Left)
+        .text_align(Align::LEFT)
         .wrap(true)
         .id_on(CursorSense::click(), |i, c, d| focus(i.clone(), c, d));
-    let header = text(msg.user).size(20).text_align(Align::Left);
+    let header = text(msg.user).size(20).text_align(Align::LEFT);
     (
         image(include_bytes!("./assets/sungals.png"))
             .sized((70, 70))
-            .align(Align::Top),
-        (header.width(rest(1)), content.width(rest(1)))
+            .align(Align::TOP),
+        (header, content)
             .span(Dir::DOWN)
             .gap(10)
-            .align(Align::Top),
+            .width(rest(1))
+            .align(Align::TOP),
     )
         .span(Dir::RIGHT)
         .gap(10)
@@ -153,13 +154,13 @@ pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Stack
         .editable()
         .size(20)
         .wrap(true)
-        .text_align(Align::Left)
+        .text_align(Align::LEFT)
         .add(ui);
 
     (
         msg_area
             .clone()
-            .align(Align::BotLeft)
+            .align(Align::BOT)
             .scroll()
             .pad(Padding::x(15))
             .height(rest(1)),