refactor; add run condition for windows

Author: frewsxcv

rgis-ui/src/debug_window.rs

@@ -119,7 +119,7 @@ impl DebugWindow<'_, '_> {
     }
 }
 
-impl crate::Window for DebugWindow<'_, '_> {
+impl crate::window::Window for DebugWindow<'_, '_> {
     type Item<'w, 's> = DebugWindow<'w, 's>;
 
     fn title(&self) -> &str {

rgis-ui/src/lib.rs

@@ -23,8 +23,7 @@ mod top_panel;
 mod welcome_window;
 mod widgets;
 
-mod window;
-pub use window::{render_window_system, IsWindowOpen, Window};
+pub(crate) mod window;
 
 pub struct Plugin;
 

rgis-ui/src/systems.rs

@@ -1,4 +1,4 @@
-use crate::render_window_system;
+use crate::window;
 use bevy::{prelude::*, window::PrimaryWindow};
 use bevy_egui::{
     egui::{self, Widget},
@@ -292,7 +292,7 @@ fn render_top_panel(
     mut app_settings: ResMut<rgis_settings::RgisSettings>,
     mut top_panel_height: ResMut<rgis_units::TopPanelHeight>,
     mut is_debug_window_open: ResMut<
-        crate::IsWindowOpen<crate::debug_window::DebugWindow<'static, 'static>>,
+        window::IsWindowOpen<crate::debug_window::DebugWindow<'static, 'static>>,
     >,
 ) {
     let Ok(mut window) = windows.get_single_mut() else {
@@ -375,14 +375,16 @@ pub fn configure(app: &mut App) {
         ),
     );
 
-    app.insert_resource(crate::IsWindowOpen::<crate::debug_window::DebugWindow>::closed());
-    app.insert_resource(crate::IsWindowOpen::<crate::welcome_window::WelcomeWindow>::open());
+    app.insert_resource(window::IsWindowOpen::<crate::debug_window::DebugWindow>::closed());
+    app.insert_resource(window::IsWindowOpen::<crate::welcome_window::WelcomeWindow>::open());
     app.add_systems(
         Update,
-        render_window_system::<crate::debug_window::DebugWindow>,
+        window::render_window_system::<crate::debug_window::DebugWindow>
+            .run_if(window::run_if_is_window_open::<crate::debug_window::DebugWindow>),
     );
     app.add_systems(
         Update,
-        render_window_system::<crate::welcome_window::WelcomeWindow>,
+        window::render_window_system::<crate::welcome_window::WelcomeWindow>
+            .run_if(window::run_if_is_window_open::<crate::welcome_window::WelcomeWindow>),
     );
 }

rgis-ui/src/top_panel.rs

@@ -1,3 +1,4 @@
+use crate::window;
 use bevy::prelude::*;
 use bevy_egui::egui;
 
@@ -7,7 +8,8 @@ pub(crate) struct TopPanel<'a, 'w, 's> {
     pub window: &'a mut Window,
     pub app_settings: &'a mut rgis_settings::RgisSettings,
     pub top_panel_height: &'a mut rgis_units::TopPanelHeight,
-    pub is_debug_window_open: &'a mut crate::IsWindowOpen<crate::debug_window::DebugWindow<'w, 's>>,
+    pub is_debug_window_open:
+        &'a mut window::IsWindowOpen<crate::debug_window::DebugWindow<'w, 's>>,
 }
 
 impl TopPanel<'_, '_, '_> {

rgis-ui/src/welcome_window.rs

@@ -16,7 +16,7 @@ impl<'w, 's> egui::Widget for WelcomeWindow<'w, 's> {
     }
 }
 
-impl crate::Window for WelcomeWindow<'_, '_> {
+impl crate::window::Window for WelcomeWindow<'_, '_> {
     type Item<'w, 's> = WelcomeWindow<'w, 's>;
 
     fn title(&self) -> &str {

rgis-ui/src/window.rs

@@ -15,23 +15,25 @@ pub trait Window: egui::Widget + SystemParam + Send + Sync {
 }
 
 pub fn render_window_system<W: Window + 'static>(
-    window: <W as crate::Window>::Item<'_, '_>,
+    window: <W as Window>::Item<'_, '_>,
     mut egui_ctx_query: Query<&'static mut EguiContext, With<PrimaryWindow>>,
-    mut is_window_open: ResMut<crate::IsWindowOpen<W>>,
+    mut is_window_open: ResMut<IsWindowOpen<W>>,
 ) {
-    if is_window_open.0 {
-        let mut egui_ctx = egui_ctx_query.single_mut();
-        let (anchor_align, anchor_offset) = window.default_anchor();
-
-        egui::Window::new(window.title())
-            .default_width(window.default_width())
-            .open(&mut is_window_open.0)
-            .resizable(false)
-            .anchor(anchor_align, anchor_offset)
-            .show(egui_ctx.get_mut(), |ui| {
-                ui.add(window);
-            });
-    }
+    let mut egui_ctx = egui_ctx_query.single_mut();
+    let (anchor_align, anchor_offset) = window.default_anchor();
+
+    egui::Window::new(window.title())
+        .default_width(window.default_width())
+        .open(&mut is_window_open.0)
+        .resizable(false)
+        .anchor(anchor_align, anchor_offset)
+        .show(egui_ctx.get_mut(), |ui| {
+            ui.add(window);
+        });
+}
+
+pub fn run_if_is_window_open<W: Window + 'static>(is_window_open: Res<IsWindowOpen<W>>) -> bool {
+    is_window_open.0
 }
 
 #[derive(Resource)]