Add Selection component

Author: benfrankel

src/game/card/deck.rs

@@ -13,7 +13,7 @@ use crate::ui::prelude::*;
 use crate::util::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
-    app.configure::<(Deck, DeckDisplay)>();
+    app.configure::<(Deck, IsDeckDisplay)>();
 }
 
 #[derive(Component, Reflect, Serialize, Deserialize, Default, Clone)]
@@ -95,11 +95,11 @@ fn advance_deck(
 
 #[derive(Component, Reflect)]
 #[reflect(Component)]
-struct DeckDisplay {
+struct IsDeckDisplay {
     target: Entity,
 }
 
-impl Configure for DeckDisplay {
+impl Configure for IsDeckDisplay {
     fn configure(app: &mut App) {
         app.register_type::<Self>();
         app.add_systems(
@@ -112,48 +112,43 @@ impl Configure for DeckDisplay {
     }
 }
 
-impl Default for DeckDisplay {
+impl Default for IsDeckDisplay {
     fn default() -> Self {
         Self {
             target: Entity::PLACEHOLDER,
         }
     }
 }
 
-// Clear deck display if its target or its target's deck has changed.
+/// Clear deck display on any change.
 fn clear_deck_display(
     mut commands: Commands,
-    deck_display_query: Query<(Entity, &DeckDisplay)>,
-    target_changed_query: Query<(), Changed<DeckDisplay>>,
+    deck_display_query: Query<(Entity, &Selection), With<IsDeckDisplay>>,
+    target_changed_query: Query<(), Changed<Selection>>,
     deck_changed_query: Query<(), Changed<Deck>>,
 ) {
-    // Clear display if target entity has not changed, but its deck has.
-    for (entity, deck_display) in &deck_display_query {
-        if !target_changed_query.contains(entity)
-            && !deck_changed_query.contains(deck_display.target)
-        {
+    for (entity, selection) in &deck_display_query {
+        if !target_changed_query.contains(entity) && !deck_changed_query.contains(selection.0) {
             continue;
         }
 
         commands.entity(entity).despawn_descendants();
     }
 }
 
-// Populate deck display if its target or its target's deck has changed.
+/// Populate deck display on any change.
 fn populate_deck_display(
     mut commands: Commands,
-    deck_display_query: Query<(Entity, &DeckDisplay)>,
+    deck_display_query: Query<(Entity, &Selection), With<IsDeckDisplay>>,
     deck_query: Query<&Deck>,
-    target_changed_query: Query<(), Changed<DeckDisplay>>,
+    target_changed_query: Query<(), Changed<IsDeckDisplay>>,
     deck_changed_query: Query<(), Changed<Deck>>,
 ) {
-    for (entity, deck_display) in &deck_display_query {
-        if !target_changed_query.contains(entity)
-            && !deck_changed_query.contains(deck_display.target)
-        {
+    for (entity, selection) in &deck_display_query {
+        if !target_changed_query.contains(entity) && !deck_changed_query.contains(selection.0) {
             continue;
         }
-        let deck = deck_query.get(deck_display.target).unwrap();
+        let deck = deck_query.get(selection.0).unwrap();
 
         commands.entity(entity).with_children(|children| {
             for (i, card_key) in deck.card_keys.iter().enumerate() {
@@ -176,7 +171,7 @@ pub fn deck_display(player: Entity) -> impl EntityCommand {
                 },
                 ..default()
             },
-            DeckDisplay { target: player },
+            IsDeckDisplay { target: player },
         ));
     }
 }

src/ui.rs

@@ -4,14 +4,22 @@
 
 pub mod font;
 pub mod interaction;
+pub mod selection;
 pub mod tooltip;
 pub mod widget;
 
 pub mod prelude {
     pub use bevy::ui::Val::*;
 
-    pub use super::font::*;
-    pub use super::interaction::*;
+    pub use super::font::parse_rich;
+    pub use super::font::parse_rich_custom;
+    pub use super::font::DynamicFontSize;
+    pub use super::font::BOLD_FONT_HANDLE;
+    pub use super::font::FONT_HANDLE;
+    pub use super::font::THICK_FONT_HANDLE;
+    pub use super::interaction::InteractionTable;
+    pub use super::interaction::IsDisabled;
+    pub use super::selection::Selection;
     pub use super::widget;
     pub use super::UiRoot;
     pub use crate::core::theme::ThemeColor;
@@ -28,7 +36,12 @@ use crate::util::prelude::*;
 pub(super) fn plugin(app: &mut App) {
     app.configure::<UiRoot>();
 
-    app.add_plugins((font::plugin, interaction::plugin, tooltip::plugin));
+    app.add_plugins((
+        font::plugin,
+        interaction::plugin,
+        selection::plugin,
+        tooltip::plugin,
+    ));
 }
 
 #[derive(Resource, Reflect)]

src/ui/font.rs

@@ -73,7 +73,7 @@ impl DynamicFontSize {
     }
 }
 
-pub fn apply_dynamic_font_size(
+fn apply_dynamic_font_size(
     window_root: Res<WindowRoot>,
     window_query: Query<&Window>,
     mut text_query: Query<(&DynamicFontSize, &Node, &mut Text)>,

src/ui/selection.rs

@@ -0,0 +1,24 @@
+use bevy::prelude::*;
+
+use crate::util::prelude::*;
+
+pub(super) fn plugin(app: &mut App) {
+    app.configure::<Selection>();
+}
+
+/// The entity that a UI display will pull values from.
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+pub struct Selection(pub Entity);
+
+impl Configure for Selection {
+    fn configure(app: &mut App) {
+        app.register_type::<Self>();
+    }
+}
+
+impl Default for Selection {
+    fn default() -> Self {
+        Self(Entity::PLACEHOLDER)
+    }
+}