render hand at index 0

src/tui/console.rs

@@ -5,8 +5,8 @@ use tui_logger::TuiLoggerWidget;
 
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default, States)]
 pub(crate) enum ConsoleState {
-    #[default]
     Closed,
+    #[default]
     Open,
 }
 

src/tui/render/hand.rs

@@ -7,44 +7,26 @@ use jong::tiles::Tile;
 use crate::tui::render::tiles;
 
 #[derive(Resource, Default)]
-pub(crate) struct RenderedHand(pub(crate) Vec<Paragraph<'static>>);
+pub(crate) struct RenderedHand(pub(crate) Vec<Vec<Paragraph<'static>>>);
 
 pub(crate) fn render_changed_hand(
-    hand: Single<&HandTiles, Changed<HandTiles>>,
+    hands: Populated<&Children, Changed<HandTiles>>,
     tiles: Populated<&Tile>,
     mut target: ResMut<RenderedHand>,
 ) -> Result {
     let mut rendered = vec![];
 
     for hand in hands {
-        let hand_tiles = hand
+        let tiles = hand
             .iter()
-            .map(|inhand| -> Result<_> { Ok(tiles.get(inhand).map(tiles::draw_tile)?) })
-            .collect::<Result<Vec<_>>>()?;
-        rendered.push(hand_tiles);
+            .map(|inhand| tiles.get(inhand).map(tiles::draw_tile).unwrap())
+            .collect();
+
+        rendered.push(tiles);
     }
 
     target.0 = rendered;
 
     trace!("render_changed_hand");
-
-    render_hand(hand, tiles, target)?;
-
-    Ok(())
-}
-
-pub(crate) fn render_hand(
-    hand: Single<&HandTiles, Changed<HandTiles>>,
-    tiles: Populated<&Tile>,
-    mut target: ResMut<RenderedHand>,
-) -> Result {
-    trace!("render_hand");
-
-    let hand_tiles = hand
-        .iter()
-        .map(|inhand| -> Result<_> { Ok(tiles.get(inhand).map(tiles::draw_tile)?) })
-        .collect::<Result<Vec<_>>>()?;
-    target.0 = hand_tiles;
-
     Ok(())
 }

src/tui/render/ingame.rs

@@ -17,8 +17,10 @@ pub(crate) fn draw_ingame(
         let mut area = frame.area();
         area.height = 4;
         let areas = layout.areas::<13>(area);
-        for (tile, area) in rendered_hand.0.iter().zip(areas.iter()) {
-            frame.render_widget(tile, *area);
+        if let Some(tiles) = rendered_hand.0.first() {
+            for (tile, area) in tiles.iter().zip(areas.iter()) {
+                frame.render_widget(tile, *area);
+            }
         }
     })?;