shadowcat/openworm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the great orientation refactor (move to x & y UiScalars/Spans) + don't call full size in align

Browse Source
This commit is contained in:
shadow cat
2025-11-20 15:44:30 -05:00
parent 416d67103d
commit 0c707c62d1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/client/ui.rs
View File

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