fix: fix an issue where buttons sometimes are unresponsive

ShenMian · Jan 16, 2024 · e03f362 · e03f362
1 parent 77079bd
commit e03f362
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -79,17 +79,15 @@ fn main() {
     )
     .add_systems(PostStartup, spawn_board);
 
-    app.add_systems(
-        Update,
-        (button_visual_effect, update_button_state, button_pressed),
-    );
+    app.add_systems(Update, (button_visual_effect, update_button_state));
 
     app.add_systems(
         Update,
         (
             (
-                action_input,
-                automatic_solution_input,
+                button_input_to_action,
+                handle_action,
+                handle_automatic_solution_action,
                 adjust_viewport,
                 mouse_input,
                 check_level_solved,
@@ -117,7 +115,11 @@ fn main() {
     app.add_systems(OnEnter(AppState::AutomaticSolution), spawn_lowerbound_marks)
         .add_systems(
             Update,
-            (update_solver, automatic_solution_input).run_if(in_state(AppState::AutomaticSolution)),
+            (
+                update_solver,
+                (button_input_to_action, handle_automatic_solution_action).chain(),
+            )
+                .run_if(in_state(AppState::AutomaticSolution)),
         )
         .add_systems(
             OnExit(AppState::AutomaticSolution),

diff --git a/src/systems/input.rs b/src/systems/input.rs
@@ -229,7 +229,7 @@ pub fn player_move_or_push(
     }
 }
 
-pub fn automatic_solution_input(
+pub fn handle_automatic_solution_action(
     action_state: Res<ActionState<Action>>,
     mut solver_state: ResMut<SolverState>,
     board: Query<&Board>,
@@ -261,7 +261,7 @@ pub fn automatic_solution_input(
     }
 }
 
-pub fn action_input(
+pub fn handle_action(
     action_state: Res<ActionState<Action>>,
     mut level_id: ResMut<LevelId>,
     database: Res<Database>,

diff --git a/src/systems/ui.rs b/src/systems/ui.rs
@@ -72,11 +72,11 @@ pub enum MainButton {
     NextLevel,
 }
 
-pub fn button_pressed(
-    interaction_query: Query<(&Interaction, &MainButton), (Changed<Interaction>, With<Button>)>,
+pub fn button_input_to_action(
+    buttons: Query<(&Interaction, &MainButton), (Changed<Interaction>, With<Button>)>,
     mut action_state: ResMut<ActionState<Action>>,
 ) {
-    for (interaction, button) in &interaction_query {
+    for (interaction, button) in &buttons {
         if *interaction != Interaction::Pressed {
             continue;
         }