fix: selected map not always highlighted

Author: invertedEcho

src/user_interface/common.rs

@@ -4,7 +4,10 @@ use bevy::{
 };
 
 use crate::{
-    game_flow::states::{AppState, InGameState, MainMenuState},
+    game_flow::{
+        game_mode::GameModeState,
+        states::{AppState, InGameState, MainMenuState},
+    },
     user_interface::map_selection::{MapSelectionButton, MapSelectionPlugin},
 };
 
@@ -34,6 +37,7 @@ fn handle_common_ui_button_press(
     mut next_app_state: ResMut<NextState<AppState>>,
     mut next_main_menu_state: ResMut<NextState<MainMenuState>>,
     mut next_in_game_stte: ResMut<NextState<InGameState>>,
+    mut next_game_mode_state: ResMut<NextState<GameModeState>>,
 ) {
     for (interaction, common_ui_button) in query {
         let Interaction::Pressed = interaction else {
@@ -47,6 +51,7 @@ fn handle_common_ui_button_press(
                 next_app_state.set(AppState::MainMenu);
                 next_main_menu_state.set(MainMenuState::Root);
                 next_in_game_stte.set(InGameState::None);
+                next_game_mode_state.set(GameModeState::None);
             }
             CommonUiButtonType::ToGameModeSelection => {
                 next_main_menu_state.set(MainMenuState::GameModeSelection);

src/user_interface/map_selection.rs

@@ -42,6 +42,8 @@ fn spawn_map_selection(
     mut commands: Commands,
     selected_map_state: Res<State<SelectedMapState>>,
 ) {
+    let selected_map_state = selected_map_state.get();
+
     commands
         .spawn((
             Node {
@@ -56,7 +58,7 @@ fn spawn_map_selection(
             DespawnOnExit(MainMenuState::MapSelection),
         ))
         .with_children(|parent| {
-            let selected_map_preview_image = match *selected_map_state.get() {
+            let selected_map_preview_image = match selected_map_state {
                 SelectedMapState::TinyTown => "maps/tiny_town/preview.png",
                 SelectedMapState::MediumPlastic => {
                     "maps/medium_plastic/preview.png"
@@ -124,6 +126,10 @@ fn spawn_map_selection(
                         font_size: DEFAULT_FONT_SIZE,
                         ..default()
                     },
+                    TextColor(get_text_button_color_for_map_selection_button(
+                        &selected_map_state,
+                        MapSelectionButton(SelectedMapState::TinyTown),
+                    )),
                 ));
             parent
                 .spawn((
@@ -139,6 +145,10 @@ fn spawn_map_selection(
                         font_size: DEFAULT_FONT_SIZE,
                         ..default()
                     },
+                    TextColor(get_text_button_color_for_map_selection_button(
+                        &selected_map_state,
+                        MapSelectionButton(SelectedMapState::MediumPlastic),
+                    )),
                 ));
             parent
                 .spawn((
@@ -185,6 +195,17 @@ fn spawn_map_selection(
         });
 }
 
+fn get_text_button_color_for_map_selection_button(
+    selected_map_state: &SelectedMapState,
+    button: MapSelectionButton,
+) -> Color {
+    if button.0 == *selected_map_state {
+        ORANGE_400.into()
+    } else {
+        WHITE.into()
+    }
+}
+
 fn update_selected_map_preview_image(
     asset_server: Res<AssetServer>,
     mut image_node: Single<&mut ImageNode, With<SelectedMapPreviewImage>>,