Open debug menu with F3 instead of menu button

Uriopass · Feb 7, 2024 · aa48a15 · aa48a15
1 parent 6dc2603
commit aa48a15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/native_app/src/gui/windows/mod.rs b/native_app/src/gui/windows/mod.rs
@@ -78,6 +78,10 @@ impl OldGUIWindows {
                 .extend(std::iter::repeat(false).take(self.windows.len() - self.opened.len()))
         }
         for (opened, w) in self.opened.iter_mut().zip(self.windows.iter()) {
+            if w.name == "Debug" {
+                continue;
+            }
+
             *opened ^= button_primary(w.name).show().clicked;
         }
     }
@@ -87,14 +91,15 @@ impl OldGUIWindows {
         if uiworld
             .write::<InputMap>()
             .just_act
-            .contains(&InputAction::OpenEconomyMenu)
+            .contains(&InputAction::OpenDebugMenu)
         {
             for (i, w) in self.windows.iter().enumerate() {
-                if w.name == "Economy" {
+                if w.name == "Debug" {
                     self.opened[i] ^= true;
                 }
             }
         }
+
         for (ws, opened) in self.windows.iter_mut().zip(self.opened.iter_mut()) {
             if *opened {
                 ws.w.render_window(egui::Window::new(ws.name).open(opened), ui, uiworld, sim);

diff --git a/native_app/src/inputmap.rs b/native_app/src/inputmap.rs
@@ -39,6 +39,7 @@ pub enum InputAction {
     UpElevation,
     DownElevation,
     OpenEconomyMenu,
+    OpenDebugMenu,
     PausePlay,
     OpenChat,
 }
@@ -102,6 +103,7 @@ const DEFAULT_BINDINGS: &[(InputAction, &[&[UnitInput]])] = &[
     (UpElevation,     &[&[Key(K::Control), WheelUp]]),
     (DownElevation,   &[&[Key(K::Control), WheelDown]]),
     (OpenEconomyMenu, &[&[Key(K::c("E"))]]),
+    (OpenDebugMenu,   &[&[Key(K::F3)]]),
     (PausePlay,       &[&[Key(K::Space)]]),
     (OpenChat,        &[&[Key(K::c("T"))]]),
 ];
@@ -339,6 +341,7 @@ impl Display for InputAction {
                 OpenChat => "Interact with Chat",
                 SizeUp => "Size Up",
                 SizeDown => "Size Down",
+                OpenDebugMenu => "Debug Menu",
             }
         )
     }