From 77622cf401e0b4d0732cc72335067c2fb77d3375 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Mon, 14 Oct 2024 00:00:27 -0400 Subject: [PATCH] Move debug info to a window --- client/src/app.rs | 5 +++++ client/src/ui/gui.rs | 43 ++++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/client/src/app.rs b/client/src/app.rs index f7c9e8d..53ca043 100644 --- a/client/src/app.rs +++ b/client/src/app.rs @@ -66,6 +66,9 @@ pub struct RealmApp { pub room_window_admin_only_send: bool, #[serde(skip)] pub room_window_admin_only_view: bool, + + #[serde(skip)] + pub info_window_open: bool, #[serde(skip)] pub login_start_channel: (Sender>, Receiver>), @@ -127,6 +130,8 @@ impl Default for RealmApp { room_window_name: String::new(), room_window_admin_only_send: false, room_window_admin_only_view: false, + + info_window_open: false, fetching_user_data_channel: broadcast::channel(10), add_server_channel: broadcast::channel(10), diff --git a/client/src/ui/gui.rs b/client/src/ui/gui.rs index b5dbf0d..fb6c95a 100644 --- a/client/src/ui/gui.rs +++ b/client/src/ui/gui.rs @@ -59,6 +59,10 @@ pub fn top_panel(app: &mut RealmApp, ctx: &Context) { app.selected_roomid.clear(); app.selected_serverid.clear(); } + + if ui.button("Info").clicked() { + app.info_window_open = true; + } if ui.button("Quit").clicked() { ctx.send_viewport_cmd(egui::ViewportCommand::Close); @@ -181,26 +185,35 @@ pub fn rooms(app: &mut RealmApp, ctx: &Context) { pub fn messages(app: &mut RealmApp, ctx: &Context) { egui::CentralPanel::default().show(ctx, |ui| { - ui.label(format!("Saved username: {:?}", app.saved_username)); - ui.label(format!("Saved token: {:?}", app.saved_token)); - ui.label(format!("Saved auth address: {:?}", app.saved_auth_address)); - ui.separator(); - - if let Some(servers) = &app.active_servers { - for server in servers { - ui.heading(&server.server_id); - ui.label(format!("{:?}", server)); - } - } - - ui.separator(); - - ui.label(format!("Current user: {:?}", app.current_user)); }); } pub fn modals(app: &mut RealmApp, ctx: &Context) { + egui::Window::new("Info") + .open(&mut app.info_window_open) + .min_size((500.0, 200.0)) + .show(ctx, |ui| { + egui::ScrollArea::vertical().show(ui, |ui| { + ui.label(format!("Saved username: {:?}", app.saved_username)); + ui.label(format!("Saved token: {:?}", app.saved_token)); + ui.label(format!("Saved auth address: {:?}", app.saved_auth_address)); + + ui.separator(); + + if let Some(servers) = &app.active_servers { + for server in servers { + ui.heading(&server.server_id); + ui.label(format!("{:?}", server)); + } + } + + ui.separator(); + + ui.label(format!("Current user: {:?}", app.current_user)); + }); + }); + egui::Window::new("Signup") .open(&mut app.signup_window_open) .min_size((500.0, 200.0))