Fix camera viewport in game mode and fix bottom tool bar

rewin123 · May 22, 2024 · 0724178 · 0724178
1 parent 2df89dc
commit 0724178
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/crates/editor_ui/src/menu_toolbars.rs b/crates/editor_ui/src/menu_toolbars.rs
@@ -40,7 +40,7 @@ impl Plugin for BottomMenuPlugin {
             bottom_menu
                 .before(EditorLoadSet)
                 .in_set(EditorSet::Editor)
-                .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
+                .run_if(in_state(ShowEditorUi::Show)),
         );
         app.add_systems(
             Update,

diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
@@ -133,10 +133,7 @@ impl Plugin for EditorUiCore {
                 .run_if(has_window_changed)
                 .in_set(UiSystemSet),
         );
-        app.add_systems(
-            Update,
-            reset_camera_viewport.run_if(in_state(EditorState::Game)),
-        );
+
         app.add_systems(OnEnter(ShowEditorUi::Hide), reset_camera_viewport);
         app.editor_tab_by_trait(EditorTabName::GameView, GameViewTab::default());