ui: Remove ButtonIcon::Text. The about button now has an icon.

This removes one of the direct uses of `embedded_graphics`.
See <#528>.

all-is-cubes-ui/src/vui/blocks.rs

@@ -2,7 +2,6 @@ use core::fmt;
 
 use exhaust::Exhaust;
 
-use all_is_cubes::drawing::embedded_graphics::mono_font::iso_8859_1 as font;
 use all_is_cubes::include_image;
 use all_is_cubes::linking::{BlockModule, BlockProvider};
 use all_is_cubes::universe::UniverseTransaction;
@@ -72,90 +71,79 @@ impl UiBlocks {
                     txn,
                     "Back",
                     ButtonIcon::Icon(include_image!("icons/button-back.png")),
-                )?
-                .build(),
+                )?,
 
-                UiBlocks::AboutButtonLabel => {
-                    make_button_label_block(txn, "About", ButtonIcon::Text(&font::FONT_10X20, "?"))?
-                        .build()
-                }
+                UiBlocks::AboutButtonLabel => make_button_label_block(
+                    txn,
+                    "About",
+                    ButtonIcon::Icon(include_image!("icons/button-help.png")),
+                )?,
 
                 UiBlocks::PauseButtonLabel => make_button_label_block(
                     txn,
                     "Pause",
                     ButtonIcon::Icon(include_image!("icons/button-pause.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::SaveButtonLabel => make_button_label_block(
                     txn,
                     "Save",
                     ButtonIcon::Icon(include_image!("icons/button-save.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::OptionsButtonLabel => make_button_label_block(
                     txn,
                     "Options",
                     ButtonIcon::Icon(include_image!("icons/button-options.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::MouselookButtonLabel => make_button_label_block(
                     txn,
                     "Mouselook",
                     ButtonIcon::Icon(include_image!("icons/button-mouselook.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::FullscreenButtonLabel => make_button_label_block(
                     txn,
                     "Fullscreen",
                     ButtonIcon::Icon(include_image!("icons/button-fullscreen.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::AntialiasButtonLabel => make_button_label_block(
                     txn,
                     "Antialiasing",
                     ButtonIcon::Icon(include_image!("icons/button-antialias.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::DebugInfoTextButtonLabel => make_button_label_block(
                     txn,
                     "Debug: Info Text",
                     ButtonIcon::Icon(include_image!("icons/button-debug-info-text.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::DebugChunkBoxesButtonLabel => make_button_label_block(
                     txn,
                     "Debug: Chunk Boxes",
                     ButtonIcon::Icon(include_image!("icons/button-debug-chunk-boxes.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::DebugBehaviorsButtonLabel => make_button_label_block(
                     txn,
                     "Debug: Behaviors",
                     ButtonIcon::Icon(include_image!("icons/button-debug-behaviors.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::DebugCollisionBoxesButtonLabel => make_button_label_block(
                     txn,
                     "Debug: Collision Boxes",
                     ButtonIcon::Icon(include_image!("icons/button-debug-collision-boxes.png")),
-                )?
-                .build(),
+                )?,
 
                 UiBlocks::DebugLightRaysButtonLabel => make_button_label_block(
                     txn,
                     "Debug: Light Rays at Cursor",
                     ButtonIcon::Icon(include_image!("icons/button-debug-light-rays.png")),
-                )?
-                .build(),
+                )?,
             })
         })
         .await

all-is-cubes-ui/src/vui/widgets/button.rs

@@ -9,20 +9,16 @@ use exhaust::Exhaust;
 use all_is_cubes::arcstr::ArcStr;
 use all_is_cubes::behavior::BehaviorSetTransaction;
 use all_is_cubes::block::{
-    self,
-    builder::BlockBuilderVoxels,
-    Block, BlockBuilder,
+    self, Block, BlockBuilder,
     Resolution::{self, *},
 };
 use all_is_cubes::color_block;
 use all_is_cubes::content::load_image::{default_srgb, DecodedPng, PngAdapter};
 use all_is_cubes::content::palette;
 use all_is_cubes::drawing::embedded_graphics::{
     image::Image as EgImage,
-    mono_font::{MonoFont, MonoTextStyle},
     prelude::{Dimensions, PixelColor, Point, Size},
     primitives::{Primitive, PrimitiveStyleBuilder, Rectangle, RoundedRectangle, StrokeAlignment},
-    text::{Alignment, Baseline, Text, TextStyleBuilder},
     Drawable,
 };
 use all_is_cubes::drawing::{DrawingPlane, VoxelBrush};
@@ -490,7 +486,6 @@ pub(crate) fn draw_target_for_button_label<C: PixelColor>(
 
 pub(crate) enum ButtonIcon<'a> {
     Icon(&'a DecodedPng),
-    Text(&'a MonoFont<'a>, &'a str),
 }
 
 /// TODO: document, refine, and make public
@@ -499,41 +494,32 @@ pub(crate) fn make_button_label_block(
     txn: &mut UniverseTransaction,
     name: &str,
     icon: ButtonIcon<'_>,
-) -> Result<BlockBuilder<BlockBuilderVoxels, ()>, InGenError> {
-    let mut space = Space::builder(GridAab::from_lower_size(
-        [0, 0, 0],
-        [theme::RESOLUTION.into(), theme::RESOLUTION.into(), 1],
-    ))
-    .physics(SpacePhysics::DEFAULT_FOR_BLOCK)
-    .build();
-    let mut draw_target = draw_target_for_button_label(&mut space);
-
-    match icon {
+) -> Result<Block, InGenError> {
+    Ok(match icon {
         ButtonIcon::Icon(icon) => {
-            let id = &PngAdapter::adapt(icon, &default_srgb);
-            EgImage::new(&id, -id.bounding_box().center() - Point::new(1, 1))
-                .draw(&mut draw_target)?;
-        }
-        ButtonIcon::Text(font, text) => {
-            Text::with_text_style(
-                text,
-                Point::new(-1, -1),
-                MonoTextStyle::new(
-                    font,
-                    &VoxelBrush::single(color_block!(palette::BUTTON_LABEL)),
-                ),
-                TextStyleBuilder::new()
-                    .baseline(Baseline::Middle)
-                    .alignment(Alignment::Center)
-                    .build(),
-            )
-            .draw(&mut draw_target)?;
+            let mut space = Space::builder(GridAab::from_lower_size(
+                [0, 0, 0],
+                [theme::RESOLUTION.into(), theme::RESOLUTION.into(), 1],
+            ))
+            .physics(SpacePhysics::DEFAULT_FOR_BLOCK)
+            .build();
+
+            // TODO: replace this with space_from_image()
+            {
+                let mut draw_target = draw_target_for_button_label(&mut space);
+
+                let id = &PngAdapter::adapt(icon, &default_srgb);
+                EgImage::new(&id, -id.bounding_box().center() - Point::new(1, 1))
+                    .draw(&mut draw_target)?;
+            }
+
+            let space = txn.insert_anonymous(space);
+            Block::builder()
+                .display_name(name.to_owned())
+                .voxels_handle(theme::RESOLUTION, space)
+                .build()
         }
-    }
-    let space = txn.insert_anonymous(space);
-    Ok(Block::builder()
-        .display_name(name.to_owned())
-        .voxels_handle(theme::RESOLUTION, space))
+    })
 }
 
 /// Common constants for button shapes.