work
This commit is contained in:
@@ -1,22 +1,19 @@
|
||||
use crate::Rsc;
|
||||
|
||||
use super::*;
|
||||
use crate::state::{ClientState, LoggedIn};
|
||||
use openworm::net::{ClientMsg, NetClientMsg};
|
||||
|
||||
pub const SIZE: u32 = 20;
|
||||
|
||||
pub fn main_view(client: &mut Client, ui: &mut Ui) -> WidgetRef {
|
||||
let ClientState::LoggedIn(state) = &mut client.state else {
|
||||
panic!("we ain't logged in buh");
|
||||
};
|
||||
let msg_panel = msg_panel(ui, state);
|
||||
pub fn main_view(rsc: &mut Rsc) -> WidgetRef {
|
||||
let msg_panel = msg_panel(rsc);
|
||||
let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
|
||||
|
||||
(side_bar, msg_panel).span(Dir::RIGHT).add(ui)
|
||||
(side_bar, msg_panel).span(Dir::RIGHT).add(rsc)
|
||||
}
|
||||
|
||||
pub fn msg_widget(username: &str, content: &str) -> impl WidgetRet {
|
||||
pub fn msg_widget(username: &str, content: &str) -> impl WidgetIdFn<Rsc> {
|
||||
let content = wtext(content)
|
||||
.editable(false)
|
||||
.editable(EditMode::MultiLine)
|
||||
.size(SIZE)
|
||||
.wrap(true)
|
||||
.attr::<Selectable>(());
|
||||
@@ -36,40 +33,32 @@ pub fn msg_widget(username: &str, content: &str) -> impl WidgetRet {
|
||||
.to_any()
|
||||
}
|
||||
|
||||
pub fn msg_panel(ui: &mut Ui, state: &mut LoggedIn) -> WidgetRef {
|
||||
let msg_area = Span::empty(Dir::DOWN).gap(15).add(ui);
|
||||
state.channel = Some(msg_area.clone());
|
||||
pub fn msg_panel(rsc: &mut Rsc) -> WidgetRef {
|
||||
let msg_area = Span::empty(Dir::DOWN).gap(15);
|
||||
|
||||
let send_text = wtext("")
|
||||
.editable(false)
|
||||
.editable(EditMode::MultiLine)
|
||||
.size(SIZE)
|
||||
.wrap(true)
|
||||
.hint(hint("send message"))
|
||||
.add(ui);
|
||||
.add(rsc);
|
||||
|
||||
let msg_area = msg_area.add(rsc);
|
||||
|
||||
(
|
||||
msg_area
|
||||
.clone()
|
||||
.scroll()
|
||||
.scrollable()
|
||||
.pad(Padding::x(15).with_top(15))
|
||||
.height(rest(1)),
|
||||
send_text
|
||||
.clone()
|
||||
.on(Submit, move |ctx| {
|
||||
let ClientState::LoggedIn(state) = &mut ctx.state.state else {
|
||||
panic!("we ain't logged in buh");
|
||||
};
|
||||
let content = ctx.widget.get_mut().take();
|
||||
let msg = NetClientMsg {
|
||||
content: content.clone(),
|
||||
};
|
||||
state.network.send(ClientMsg::SendMsg(msg.clone()));
|
||||
let msg = msg_widget(&state.username, &content).add(ctx.ui);
|
||||
msg_area.get_mut().children.push(msg);
|
||||
.on(Submit, move |ctx, rsc| {
|
||||
let content = ctx.widget.edit(rsc).take();
|
||||
let msg = msg_widget("ur mothe:", &content).add_strong(rsc);
|
||||
rsc.ui[msg_area].children.push(msg);
|
||||
})
|
||||
.pad(15)
|
||||
.attr::<Selector>(send_text)
|
||||
.scroll()
|
||||
.scrollable()
|
||||
.masked()
|
||||
.background(rect(Color::BLACK.brighter(0.05)).radius(15))
|
||||
.pad(15)
|
||||
@@ -78,5 +67,5 @@ pub fn msg_panel(ui: &mut Ui, state: &mut LoggedIn) -> WidgetRef {
|
||||
)
|
||||
.span(Dir::DOWN)
|
||||
.width(rest(1))
|
||||
.add(ui)
|
||||
.add(rsc)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user