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

accounts are now real

Browse Source
This commit is contained in:
shadow cat
2025-12-03 22:51:57 -05:00
parent 4aa22de61b
commit 24bb65bf7b
15 changed files with 679 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/bin/client/ui/main.rs
View File

@@ -1,9 +1,15 @@
use super::*;
use crate::state::{ClientState, LoggedIn};
use iris::layout::len_fns::*;
use openworm::net::{ClientMsg, NetClientMsg, NetServerMsg};
pub const SIZE: u32 = 20;
pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId {
let msg_panel = msg_panel(client, network);
pub fn main_view(client: &mut Client) -> WidgetId {
let ClientState::LoggedIn(state) = &mut client.state else {
panic!("we ain't logged in buh");
};
let msg_panel = msg_panel(&mut client.ui, state);
let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
let bg = (
@@ -18,13 +24,13 @@ pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId {
.any()
}
pub fn msg_widget(msg: NetMsg) -> impl WidgetLike<FnTag> {
let content = text(msg.content)
pub fn msg_widget(username: &str, content: &str) -> impl WidgetRet {
let content = wtext(content)
.editable(false)
.size(SIZE)
.wrap(true)
.attr::<Selectable>(());
let header = text(msg.user).size(SIZE);
let header = wtext(username).size(SIZE);
(
image(include_bytes!("../assets/sungals.png"))
.sized((70, 70))
@@ -37,14 +43,14 @@ pub fn msg_widget(msg: NetMsg) -> impl WidgetLike<FnTag> {
)
.span(Dir::RIGHT)
.gap(10)
.to_any()
}
pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized> + use<> {
let Client { ui, channel, .. } = client;
pub fn msg_panel(ui: &mut Ui, state: &mut LoggedIn) -> impl WidgetRet + use<> {
let msg_area = Span::empty(Dir::DOWN).gap(15).add(ui);
*channel = Some(msg_area.clone());
state.channel = Some(msg_area.clone());
let send_text = text("")
let send_text = wtext("")
.editable(false)
.size(SIZE)
.wrap(true)
@@ -60,13 +66,15 @@ pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized
send_text
.clone()
.id_on(Submit, move |id, client: &mut Client, _| {
let content = client.ui.text(id).take();
let msg = NetMsg {
content: content.clone(),
user: client.username.clone(),
let ClientState::LoggedIn(state) = &mut client.state else {
panic!("we ain't logged in buh");
};
network.send(ClientMsg::SendMsg(msg.clone()));
let msg = msg_widget(msg).add(&mut client.ui);
let content = client.ui.text(id).take();
let msg = NetClientMsg {
content: content.clone(),
};
state.network.send(ClientMsg::SendMsg(msg.clone()));
let msg = msg_widget(&client.data.username, &content).add(&mut client.ui);
client.ui[&msg_area].children.push(msg.any());
})
.pad(15)
@@ -80,4 +88,5 @@ pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Sized
)
.span(Dir::DOWN)
.width(rest(1))
.to_any()
}