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

update iris & get button working again

Browse Source
This commit is contained in:
Shadow Cat
2026-01-19 21:26:59 -05:00
parent 040b70e1c5
commit e67c55d67d
8 changed files with 213 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/client/ui/connect.rs
View File

@@ -1,6 +1,6 @@
use super::*;
pub fn start_ui(rsc: &mut Rsc) -> WidgetRef {
pub fn start_ui(rsc: &mut Rsc) -> WeakWidget {
let mut accounts = Span::empty(Dir::DOWN);
accounts.push(
@@ -14,17 +14,15 @@ pub fn start_ui(rsc: &mut Rsc) -> WidgetRef {
let connect = Button::submit("connect", rsc);
let create = Button::submit("create", rsc);
connect.on(Submit, move |_, rsc| {
connect.disable();
create.disable();
rsc.events.register(connect.root(), Submit, move |_, rsc| {
connect.disable(rsc);
create.disable(rsc);
});
let connect_ = connect.clone();
let create_ = create.clone();
ui.on(create.view(), Submit, move |ctx| {
connect_.disable();
create_.disable();
create_ui(ctx.ui).set_ptr(&ctx.state.main_ui, ctx.ui);
rsc.events.register(create.root(), Submit, move |ctx, rsc| {
connect.disable(rsc);
create.disable(rsc);
create_ui(rsc).set_ptr(ctx.state.main_ui, rsc);
});
(
@@ -35,14 +33,14 @@ pub fn start_ui(rsc: &mut Rsc) -> WidgetRef {
.span(Dir::DOWN)
.gap(30)
.modal(400)
.add(ui)
.add(rsc)
}
pub fn create_ui(ui: &mut Ui) -> WidgetRef {
wtext("hi").add(ui)
pub fn create_ui(rsc: &mut Rsc) -> WeakWidget {
wtext("hi").add(rsc)
}
// pub fn connect_screen(client: &mut Client, ui: &mut Ui, state: &UiState) -> WidgetRef {
// pub fn connect_screen(client: &mut Client, ui: &mut Ui, state: &UiState) -> WeakWidget {
// let Client { data, proxy, .. } = client;
// let ip = field_widget(&data.ip, "ip", ui);
// let ip_ = ip.clone();
@@ -84,7 +82,7 @@ pub fn create_ui(ui: &mut Ui) -> WidgetRef {
// .add(ui)
// }
// pub fn login_screen(client: &mut Client, ui: &mut Ui) -> WidgetRef {
// pub fn login_screen(client: &mut Client, ui: &mut Ui) -> WeakWidget {
// let Client { data, .. } = client;
// let username = field_widget(&data.username, "username", ui);
// let password = field_widget(&data.password, "password", ui);