Adjust UI a bit

benfrankel · Jul 27, 2024 · 2483f07 · 2483f07
1 parent c18bd96
commit 2483f07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/assets/config/card.ron b/assets/config/card.ron
@@ -1,7 +1,7 @@
 
 (
     // Deck:
-    deck_cap: 8,
+    deck_cap: 10,
 
     // Cards:
     card_height: Vw(9.0),

diff --git a/src/screen/playing/level_up_menu.rs b/src/screen/playing/level_up_menu.rs
@@ -62,8 +62,8 @@ fn level_up_menu(mut entity: EntityWorldMut) {
                     Name::new("LevelUpMenu"),
                     NodeBundle {
                         style: Style {
-                            height: VMin(60.0),
-                            top: Vw(-2.5),
+                            height: VMin(65.0),
+                            top: Vw(-1.7),
                             align_items: AlignItems::Center,
                             justify_content: JustifyContent::SpaceBetween,
                             flex_direction: FlexDirection::Column,
@@ -120,7 +120,7 @@ fn instructions_container(mut entity: EntityWorldMut) {
                 "You can sort your cards during a level up:",
                 "",
                 "- [b]Select: [r] A/D or Arrow Keys",
-                "- [b]Move:   [r] Shift + A/D",
+                "- [b]Move:   [r] Shift + A/D or Arrow Keys",
                 "- [b]Discard:[r] Delete",
             ]
             .into_iter()
@@ -155,7 +155,7 @@ fn card_options_container(entity: Entity, world: &mut World) {
             NodeBundle {
                 style: Style {
                     width: Vw(55.0),
-                    top: Vw(-1.8),
+                    top: Vw(-1.5),
                     align_items: AlignItems::Center,
                     justify_content: JustifyContent::SpaceBetween,
                     ..default()
@@ -206,6 +206,7 @@ fn card_button(key: impl Into<String>) -> impl EntityCommand<World> {
                       mut toggle_query: Query<&mut Style, With<ToggleDisplay>>| {
                     for selection in &deck_display_query {
                         let mut deck = c!(deck_query.get_mut(selection.0));
+                        // TODO: What if deck is at capacity?
                         deck.add(key.clone());
                     }
                     for mut style in &mut toggle_query {
@@ -277,8 +278,8 @@ fn skip_button(mut entity: EntityWorldMut) {
             },
         ),
         Style {
-            height: Vw(8.0),
-            width: Vw(28.0),
+            height: Vw(8.5),
+            width: Vw(25.0),
             align_items: AlignItems::Center,
             justify_content: JustifyContent::Center,
             ..default()
@@ -292,8 +293,8 @@ fn dance_button(mut entity: EntityWorldMut) {
         On::<Pointer<Click>>::run(PlayingMenu::disable),
         Style {
             display: Display::None,
-            height: Vw(8.0),
-            width: Vw(28.0),
+            height: Vw(8.5),
+            width: Vw(25.0),
             align_items: AlignItems::Center,
             justify_content: JustifyContent::Center,
             ..default()