cleanup old menu

native_app/src/game_loop.rs

@@ -9,8 +9,8 @@ use geom::{vec2, vec3, Camera, LinearColor};
 use simulation::Simulation;
 
 use crate::audio::GameAudio;
+use crate::gui::debug_window::DebugObjs;
 use crate::gui::render_oldgui;
-use crate::gui::windows::debug::DebugObjs;
 use crate::inputmap::{Bindings, InputAction, InputMap};
 use crate::newgui;
 use crate::newgui::follow::FollowEntity;

native_app/src/gui/debug_inspect.rs

@@ -1,6 +1,7 @@
 use egui::Ui;
 use egui::{Context, Window};
 
+use crate::gui::debug_window::DebugState;
 use egui_inspect::{Inspect, InspectArgs};
 use simulation::economy::Market;
 use simulation::transportation::Location;
@@ -9,7 +10,6 @@ use simulation::{
     WagonEnt,
 };
 
-use crate::gui::windows::debug::DebugState;
 use crate::newgui::follow::FollowEntity;
 use crate::newgui::InspectedEntity;
 use crate::uiworld::UiWorld;

native_app/src/gui/windows/debug.rs → native_app/src/gui/debug_window.rs

@@ -1,16 +1,16 @@
 #![allow(clippy::type_complexity)]
 
 use crate::game_loop::Timings;
-use crate::newgui::InspectedEntity;
+use crate::newgui::{GuiState, InspectedEntity};
 use crate::uiworld::UiWorld;
 use simulation::map_dynamic::ParkingManagement;
 use simulation::transportation::TransportGrid;
 use simulation::{Simulation, TrainID};
 use std::time::{Duration, Instant};
 
-use crate::inputmap::InputMap;
+use crate::inputmap::{InputAction, InputMap};
 use crate::newgui::windows::settings::Settings;
-use egui::Widget;
+use egui::{Context, Widget};
 use engine::{PerfCountersStatic, Tesselator};
 use geom::{Camera, Color, LinearColor, Spline3, Vec2};
 use prototypes::{GameDuration, GameTime, SECONDS_PER_DAY};
@@ -67,8 +67,27 @@ impl Default for TestFieldProperties {
     }
 }
 
+pub fn debug_window(ui: &Context, uiworld: &UiWorld, sim: &Simulation) {
+    if uiworld
+        .write::<InputMap>()
+        .just_act
+        .contains(&InputAction::OpenDebugMenu)
+    {
+        uiworld.write::<GuiState>().debug_window ^= true;
+    }
+
+    let mut opened = uiworld.read::<GuiState>().debug_window;
+    debug(
+        egui::Window::new("Debug").open(&mut opened),
+        ui,
+        uiworld,
+        sim,
+    );
+    uiworld.write::<GuiState>().debug_window = opened;
+}
+
 /// debug window for various debug options
-pub fn debug(window: egui::Window<'_>, ui: &egui::Context, uiworld: &UiWorld, sim: &Simulation) {
+fn debug(window: egui::Window<'_>, ui: &egui::Context, uiworld: &UiWorld, sim: &Simulation) {
     window.show(ui, |ui| {
         let mut objs = uiworld.write::<DebugObjs>();
         for (val, name, _) in &mut objs.0 {

native_app/src/gui/hud.rs

@@ -6,6 +6,7 @@ use simulation::Simulation;
 
 use crate::gui::chat::chat;
 use crate::gui::debug_inspect::debug_inspector;
+use crate::gui::debug_window::debug_window;
 use crate::newgui::{ErrorTooltip, GuiState, PotentialCommands};
 use crate::uiworld::UiWorld;
 
@@ -20,10 +21,7 @@ pub fn render_oldgui(ui: &Context, uiworld: &UiWorld, sim: &Simulation) {
 
     chat(ui, uiworld, sim);
 
-    uiworld
-        .write::<GuiState>()
-        .old_windows
-        .render(ui, uiworld, sim);
+    debug_window(ui, uiworld, sim);
 
     tooltip(ui, uiworld, sim);
 }

native_app/src/gui/mod.rs

@@ -1,6 +1,6 @@
 pub mod chat;
 pub mod debug_inspect;
+pub mod debug_window;
 pub mod hud;
-pub mod windows;
 
 pub use hud::*;

native_app/src/init.rs

@@ -1,6 +1,6 @@
 use crate::game_loop::Timings;
 use crate::gui::chat::GUIChatState;
-use crate::gui::windows::debug::{DebugObjs, DebugState, TestFieldProperties};
+use crate::gui::debug_window::{DebugObjs, DebugState, TestFieldProperties};
 use crate::inputmap::{Bindings, InputMap};
 use crate::network::NetworkState;
 use crate::newgui::bulldozer::BulldozerState;

native_app/src/newgui/hud/menu.rs

@@ -30,7 +30,6 @@ pub fn menu_bar(uiworld: &UiWorld, sim: &Simulation) {
                         l.show(|| {
                             let mut gui = uiworld.write::<GuiState>();
                             gui.windows.menu();
-                            gui.old_windows.menu();
                             save_window(&mut *gui, uiworld);
                             textc(
                                 on_primary_container(),

native_app/src/newgui/inspect/mod.rs

@@ -1,4 +1,4 @@
-use crate::gui::windows::debug::DebugState;
+use crate::gui::debug_window::DebugState;
 use crate::newgui::follow::FollowEntity;
 use crate::newgui::{InspectedBuilding, InspectedEntity};
 use crate::uiworld::UiWorld;

native_app/src/newgui/mod.rs

@@ -1,4 +1,3 @@
-use crate::gui::windows::OldGUIWindows;
 use crate::newgui::windows::GUIWindows;
 use crate::uiworld::UiWorld;
 use simulation::map::BuildingID;
@@ -135,7 +134,7 @@ impl Tool {
 }
 
 pub struct GuiState {
-    pub old_windows: OldGUIWindows,
+    pub debug_window: bool,
     pub windows: GUIWindows,
     pub last_save: Instant,
     pub last_gui_save: Instant,
@@ -146,7 +145,7 @@ pub struct GuiState {
 impl Default for GuiState {
     fn default() -> Self {
         Self {
-            old_windows: OldGUIWindows::default(),
+            debug_window: false,
             windows: Default::default(),
             last_save: Instant::now(),
             last_gui_save: Instant::now(),