Put all HUD elements in a single flexbox

Author: Zakru

crates/controller/src/hud/actionbar.rs

@@ -16,8 +16,7 @@ pub(crate) struct ActionBarPlugin;
 
 impl Plugin for ActionBarPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(cleanup.in_schedule(OnExit(GameState::Playing)))
+        app.add_system(cleanup.in_schedule(OnExit(GameState::Playing)))
             .add_system(
                 detect_update
                     .in_base_set(GameSet::PostUpdate)
@@ -54,27 +53,13 @@ struct ActiveEntity(Option<Entity>);
 #[derive(Component)]
 struct ButtonAction(UnitType);
 
-fn cleanup(mut commands: Commands) {
-    commands.remove_resource::<ActionBarNode>();
-    commands.remove_resource::<ActiveEntity>();
-}
-
-fn setup(mut commands: Commands) {
+pub(crate) fn setup_actionbar(commands: &mut Commands) -> Entity {
     let entity = commands
         .spawn((
             NodeBundle {
                 style: Style {
-                    size: Size {
-                        width: Val::Percent(60.),
-                        height: Val::Percent(15.),
-                    },
-                    position_type: PositionType::Absolute,
-                    position: UiRect::new(
-                        Val::Percent(20.),
-                        Val::Percent(80.),
-                        Val::Percent(85.),
-                        Val::Percent(100.),
-                    ),
+                    size: Size::height(Val::Percent(50.)),
+                    flex_grow: 1.,
                     ..default()
                 },
                 background_color: HUD_COLOR.into(),
@@ -87,6 +72,12 @@ fn setup(mut commands: Commands) {
 
     commands.insert_resource(ActionBarNode(entity));
     commands.init_resource::<ActiveEntity>();
+    entity
+}
+
+fn cleanup(mut commands: Commands) {
+    commands.remove_resource::<ActionBarNode>();
+    commands.remove_resource::<ActiveEntity>();
 }
 
 fn detect_update(mut active: ResMut<ActiveEntity>, selected: Query<Entity, With<Selected>>) {

crates/controller/src/hud/details.rs

@@ -1,37 +1,23 @@
 use bevy::prelude::*;
-use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState};
 
 use super::{interaction::InteractionBlocker, HUD_COLOR};
 
-pub(crate) struct DetailsPlugin;
-
-impl Plugin for DetailsPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_system(spawn_details.in_schedule(OnEnter(GameState::Playing)));
-    }
-}
-
-fn spawn_details(mut commands: Commands) {
-    commands.spawn((
-        NodeBundle {
-            style: Style {
-                size: Size {
-                    width: Val::Percent(20.),
-                    height: Val::Percent(30.),
+pub(crate) fn setup_details(commands: &mut Commands) -> Entity {
+    commands
+        .spawn((
+            NodeBundle {
+                style: Style {
+                    size: Size {
+                        width: Val::Percent(20.),
+                        height: Val::Percent(100.),
+                    },
+                    flex_shrink: 0.,
+                    ..default()
                 },
-                position_type: PositionType::Absolute,
-                position: UiRect::new(
-                    Val::Percent(0.),
-                    Val::Percent(20.),
-                    Val::Percent(70.),
-                    Val::Percent(100.),
-                ),
+                background_color: HUD_COLOR.into(),
                 ..default()
             },
-            background_color: HUD_COLOR.into(),
-            ..default()
-        },
-        DespawnOnGameExit,
-        InteractionBlocker,
-    ));
+            InteractionBlocker,
+        ))
+        .id()
 }

crates/controller/src/hud/minimap/mod.rs

@@ -7,6 +7,8 @@ mod fill;
 mod interaction;
 mod nodes;
 
+pub(crate) use nodes::setup_minimap;
+
 pub(crate) struct MinimapPlugin;
 
 impl Plugin for MinimapPlugin {

crates/controller/src/hud/minimap/nodes.rs

@@ -2,7 +2,7 @@ use bevy::{
     prelude::*,
     render::render_resource::{Extent3d, TextureDimension, TextureFormat},
 };
-use de_core::{baseset::GameSet, cleanup::DespawnOnGameExit, gamestate::GameState};
+use de_core::{baseset::GameSet, gamestate::GameState};
 use de_map::size::MapBounds;
 
 use crate::hud::{interaction::InteractionBlocker, HUD_COLOR};
@@ -11,65 +11,55 @@ pub(super) struct NodesPlugin;
 
 impl Plugin for NodesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(
-                update_resolution
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing)),
-            );
+        app.add_system(
+            update_resolution
+                .in_base_set(GameSet::PreMovement)
+                .run_if(in_state(GameState::Playing)),
+        );
     }
 }
 
 #[derive(Component)]
 pub(super) struct MinimapNode;
 
-fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>, map_bounds: Res<MapBounds>) {
-    let handle = images.add(new_image(UVec2::splat(128)));
+pub(crate) fn setup_minimap(
+    commands: &mut Commands,
+    mut images: ResMut<Assets<Image>>,
+    map_bounds: Res<MapBounds>,
+) -> Entity {
+    let handle = images.add(new_image(UVec2::new(256, 128)));
     let map_size = map_bounds.size();
     let aspect = map_size.x / map_size.y;
 
     commands
-        .spawn(NodeBundle {
-            style: Style {
-                position_type: PositionType::Absolute,
-                position: UiRect::bottom(Val::Px(0.)),
-                size: Size::new(Val::Percent(100.), Val::Percent(30.)),
-                justify_content: JustifyContent::End,
+        .spawn((
+            NodeBundle {
+                style: Style {
+                    max_size: Size::new(Val::Percent(20.), Val::Percent(100.)),
+                    size: Size::height(Val::Percent(100.)),
+                    padding: UiRect::all(Val::Percent(1.)),
+                    ..default()
+                },
+                background_color: HUD_COLOR.into(),
                 ..default()
             },
-            ..default()
-        })
-        .insert(DespawnOnGameExit)
+            InteractionBlocker,
+        ))
         .with_children(|parent| {
             parent
-                .spawn(NodeBundle {
+                .spawn(ImageBundle {
                     style: Style {
-                        size: Size::width(Val::Percent(20.)),
-                        padding: UiRect::all(Val::Percent(1.)),
-                        align_items: AlignItems::Center,
-                        justify_content: JustifyContent::Center,
+                        size: Size::all(Val::Percent(100.)),
+                        aspect_ratio: Some(aspect),
                         ..default()
                     },
-                    background_color: HUD_COLOR.into(),
+                    background_color: Color::WHITE.into(),
+                    image: handle.into(),
                     ..default()
                 })
-                .insert(InteractionBlocker)
-                .with_children(|parent| {
-                    parent
-                        .spawn(ImageBundle {
-                            style: Style {
-                                max_size: Size::all(Val::Percent(100.)),
-                                size: Size::height(Val::Percent(100.)),
-                                aspect_ratio: Some(aspect),
-                                ..default()
-                            },
-                            background_color: Color::WHITE.into(),
-                            image: handle.into(),
-                            ..default()
-                        })
-                        .insert(MinimapNode);
-                });
-        });
+                .insert(MinimapNode);
+        })
+        .id()
 }
 
 type ChangedMinimap = (Changed<Node>, With<MinimapNode>);

crates/controller/src/hud/mod.rs

@@ -7,12 +7,17 @@ mod menu;
 mod minimap;
 mod selection;
 
+use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState};
+use de_map::size::MapBounds;
 pub(crate) use interaction::HudNodes;
 pub(crate) use menu::{GameMenuSet, ToggleGameMenu};
 pub(crate) use selection::UpdateSelectionBoxEvent;
 
 use self::{
-    actionbar::ActionBarPlugin, details::DetailsPlugin, menu::MenuPlugin, minimap::MinimapPlugin,
+    actionbar::{setup_actionbar, ActionBarPlugin},
+    details::setup_details,
+    menu::MenuPlugin,
+    minimap::{setup_minimap, MinimapPlugin},
     selection::SelectionPlugin,
 };
 
@@ -23,9 +28,31 @@ pub(crate) struct HudPlugin;
 impl Plugin for HudPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugin(SelectionPlugin)
-            .add_plugin(DetailsPlugin)
             .add_plugin(ActionBarPlugin)
             .add_plugin(MenuPlugin)
-            .add_plugin(MinimapPlugin);
+            .add_plugin(MinimapPlugin)
+            .add_system(setup.in_schedule(OnEnter(GameState::Playing)));
     }
 }
+
+fn setup(mut commands: Commands, images: ResMut<Assets<Image>>, map_bounds: Res<MapBounds>) {
+    let details = setup_details(&mut commands);
+    let actionbar = setup_actionbar(&mut commands);
+    let minimap = setup_minimap(&mut commands, images, map_bounds);
+
+    commands
+        .spawn(NodeBundle {
+            style: Style {
+                position_type: PositionType::Absolute,
+                position: UiRect::bottom(Val::Px(0.)),
+                size: Size::new(Val::Percent(100.), Val::Percent(30.)),
+                align_items: AlignItems::End,
+                ..default()
+            },
+            ..default()
+        })
+        .insert(DespawnOnGameExit)
+        .add_child(details)
+        .add_child(actionbar)
+        .add_child(minimap);
+}