refactor(ui): refactor button interaction related code

ShenMian · Jul 27, 2024 · 6ec4a94 · 6ec4a94
1 parent b24300b
commit 6ec4a94
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/systems/ui.rs b/src/systems/ui.rs
@@ -89,7 +89,6 @@ pub fn setup_button(mut commands: Commands, asset_server: Res<AssetServer>) {
                         ..default()
                     },
                     border_color: Color::NONE.into(),
-                    background_color: BUTTON_NORMAL_COLOR.into(),
                     ..default()
                 },
             ))
@@ -154,23 +153,24 @@ pub fn update_button_state(
     }
 }
 
-const BUTTON_NORMAL_COLOR: Color = Color::srgba(0.7, 0.7, 0.7, 0.8);
-const BUTTON_HOVERED_COLOR: Color = Color::srgba(0.55, 0.55, 0.55, 0.8);
-const BUTTON_PRESSED_COLOR: Color = Color::srgba(0.35, 0.75, 0.35, 0.8);
-
 /// Applies visual effects to buttons based on user interaction.
 pub fn button_visual_effect(
     mut interaction_query: Query<
         (&Interaction, &mut BackgroundColor),
         (Changed<Interaction>, With<Button>),
     >,
 ) {
-    for (interaction, mut color) in &mut interaction_query {
-        match *interaction {
-            Interaction::Pressed => *color = BUTTON_PRESSED_COLOR.into(),
-            Interaction::Hovered => *color = BUTTON_HOVERED_COLOR.into(),
-            Interaction::None => *color = BUTTON_NORMAL_COLOR.into(),
+    const BUTTON_NORMAL_COLOR: Color = Color::srgba(0.7, 0.7, 0.7, 0.8);
+    const BUTTON_HOVERED_COLOR: Color = Color::srgba(0.55, 0.55, 0.55, 0.8);
+    const BUTTON_PRESSED_COLOR: Color = Color::srgba(0.35, 0.75, 0.35, 0.8);
+
+    for (interaction, mut background_color) in &mut interaction_query {
+        *background_color = match *interaction {
+            Interaction::Pressed => BUTTON_PRESSED_COLOR,
+            Interaction::Hovered => BUTTON_HOVERED_COLOR,
+            Interaction::None => BUTTON_NORMAL_COLOR,
         }
+        .into();
     }
 }