From 5964797986f7b7cabbaf42e929a5c170a30bb195 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 9 Mar 2023 13:01:12 +0200 Subject: [PATCH] feat(client): show title in play menu --- client/src/plugins/menu/ui/play/mod.rs | 13 ++++++++++++- client/src/plugins/menu/ui/play/ui.rs | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/src/plugins/menu/ui/play/mod.rs b/client/src/plugins/menu/ui/play/mod.rs index b946113..aebeff2 100644 --- a/client/src/plugins/menu/ui/play/mod.rs +++ b/client/src/plugins/menu/ui/play/mod.rs @@ -17,7 +17,7 @@ pub struct PlayScreenData { pub browse_state: PlayScreenBrowseState, } -#[derive(Default, PartialEq)] +#[derive(Default, PartialEq, Clone)] pub enum PlayScreenState { #[default] Main, @@ -26,6 +26,17 @@ pub enum PlayScreenState { InLobbyGuest, } +impl PlayScreenState { + pub fn display(&self) -> &str { + match self { + PlayScreenState::Main => "Play", + PlayScreenState::CreateGame => "Create", + PlayScreenState::InLobbyHost => "Lobby (Host)", + PlayScreenState::InLobbyGuest => "Lobby (Guest)", + } + } +} + #[derive(Default, PartialEq)] pub enum PlayScreenBrowseState { #[default] diff --git a/client/src/plugins/menu/ui/play/ui.rs b/client/src/plugins/menu/ui/play/ui.rs index c6c59b7..4a875f5 100644 --- a/client/src/plugins/menu/ui/play/ui.rs +++ b/client/src/plugins/menu/ui/play/ui.rs @@ -20,10 +20,9 @@ pub fn ui( mut data: ResMut, cfg_user: Res, ) { - // TODO: title used to be: rtdmenu.play_menu_ui_state.display()).size(32.) menuwindow( egui_context.ctx_mut(), - "TEMP", + data.state.clone().display(), &egui::Vec2::new(800., 600.), |ui| match data.state { PlayScreenState::Main => { -- 2.44.1