ui: Give dialogs a title bar of sorts.

This saves one row of space in dialogs that have both a title and a
close/back button.

all-is-cubes-ui/src/editor.rs

@@ -25,7 +25,6 @@ pub fn inspect_block_at_cursor(
     let contents = Arc::new(vui::LayoutTree::Stack {
         direction: Face6::NY,
         children: vec![
-            back_button(inputs),
             vui::leaf_widget(hit.block.clone().with_modifier(block::Quote::new())),
             Arc::new(vui::LayoutTree::Stack {
                 direction: Face6::PX,
@@ -43,7 +42,12 @@ pub fn inspect_block_at_cursor(
         ],
     });
 
-    vui::Page::new_modal_dialog(&inputs.hud_blocks.widget_theme, contents)
+    vui::Page::new_modal_dialog(
+        &inputs.hud_blocks.widget_theme,
+        literal!("Inspect Block"),
+        Some(back_button(inputs)),
+        contents,
+    )
 }
 
 fn inspect_block_definition(block: &Block) -> vui::WidgetTree {

all-is-cubes-ui/src/ui_content/pages.rs

@@ -22,12 +22,11 @@ pub(super) fn new_paused_page(
     u: &mut Universe,
     hud_inputs: &HudInputs,
 ) -> Result<vui::Page, InstallVuiError> {
-    use parts::{heading, shrink};
+    use parts::shrink;
 
     let mut children = vec![
         // TODO: establish standard resolutions for logo etc
         vui::leaf_widget(shrink(u, R16, &vui::leaf_widget(logo_text()))?),
-        heading("Paused"),
         vui::leaf_widget(open_page_button(
             hud_inputs,
             VuiPageState::AboutText,
@@ -66,6 +65,11 @@ pub(super) fn new_paused_page(
     });
     Ok(vui::Page::new_modal_dialog(
         &hud_inputs.hud_blocks.widget_theme,
+        literal!("Paused"),
+        Some(vui::leaf_widget(pause_toggle_button(
+            hud_inputs,
+            OptionsStyle::CompactRow,
+        ))),
         contents,
     ))
 }
@@ -86,36 +90,28 @@ pub(super) fn new_progress_page(
         )),
     ];
 
-    // TODO: should have at least a title giving context
+    // TODO: should have a title sourced from the notification data
     let contents = Arc::new(LayoutTree::Stack {
         direction: Face6::NY,
         children,
     });
-    vui::Page::new_modal_dialog(theme, contents)
+    vui::Page::new_modal_dialog(theme, literal!("Progress"), None, contents)
 }
 
-pub(super) fn new_options_widget_tree(
-    u: &mut Universe,
-    hud_inputs: &HudInputs,
-) -> Result<vui::Page, InstallVuiError> {
-    use parts::{heading, shrink};
-
+pub(super) fn new_options_widget_tree(hud_inputs: &HudInputs) -> vui::Page {
     let contents = Arc::new(LayoutTree::Stack {
         direction: Face6::NY,
-        children: vec![
-            vui::leaf_widget(shrink(u, R32, &vui::leaf_widget(logo_text()))?),
-            heading("Options"),
-            back_button(hud_inputs),
-            Arc::new(LayoutTree::Stack {
-                direction: Face6::NY,
-                children: graphics_options_widgets(hud_inputs, OptionsStyle::LabeledColumn),
-            }),
-        ],
+        children: vec![Arc::new(LayoutTree::Stack {
+            direction: Face6::NY,
+            children: graphics_options_widgets(hud_inputs, OptionsStyle::LabeledColumn),
+        })],
     });
-    Ok(vui::Page::new_modal_dialog(
+    vui::Page::new_modal_dialog(
         &hud_inputs.hud_blocks.widget_theme,
+        literal!("Options"),
+        Some(back_button(hud_inputs)),
         contents,
-    ))
+    )
 }
 
 /// TODO: The content of the about page should be customizable in the final build or
@@ -152,7 +148,6 @@ pub(super) fn new_about_page(
         direction: Face6::NY,
         children: vec![
             vui::leaf_widget(shrink(u, R8, &vui::leaf_widget(logo_text()))?),
-            back_button(hud_inputs),
             heading("Controls"),
             paragraph(controls_text),
             heading("About"),
@@ -164,6 +159,8 @@ pub(super) fn new_about_page(
 
     Ok(vui::Page::new_modal_dialog(
         &hud_inputs.hud_blocks.widget_theme,
+        literal!("About All is Cubes"),
+        Some(back_button(hud_inputs)),
         contents,
     ))
 }
@@ -172,12 +169,12 @@ pub(super) fn new_about_page(
 pub(super) fn new_message_page(message: ArcStr, hud_inputs: &HudInputs) -> vui::Page {
     use parts::paragraph;
 
-    let contents = Arc::new(LayoutTree::Stack {
-        direction: Face6::NY,
-        children: vec![paragraph(message), back_button(hud_inputs)],
-    });
-
-    vui::Page::new_modal_dialog(&hud_inputs.hud_blocks.widget_theme, contents)
+    vui::Page::new_modal_dialog(
+        &hud_inputs.hud_blocks.widget_theme,
+        literal!(""), // TODO:
+        Some(back_button(hud_inputs)),
+        paragraph(message),
+    )
 }
 
 /// Make a button that sends [`VuiMessage::Open`].

all-is-cubes-ui/src/ui_content/vui_manager.rs

@@ -146,7 +146,7 @@ impl Vui {
         );
 
         let paused_page = pages::new_paused_page(&mut universe, &hud_inputs).unwrap();
-        let options_page = pages::new_options_widget_tree(&mut universe, &hud_inputs).unwrap();
+        let options_page = pages::new_options_widget_tree(&hud_inputs);
         let about_page = pages::new_about_page(&mut universe, &hud_inputs).unwrap();
         let progress_page =
             pages::new_progress_page(&hud_inputs.hud_blocks.widget_theme, &notif_hub);

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

@@ -122,7 +122,13 @@ impl Page {
     }
 
     /// Wrap the given widget tree in a dialog box and a transparent screen-filling background.
-    pub fn new_modal_dialog(theme: &widgets::WidgetTheme, contents: WidgetTree) -> Self {
+    pub fn new_modal_dialog(
+        theme: &widgets::WidgetTheme,
+        title: ArcStr,
+        corner_button: Option<WidgetTree>,
+        contents: WidgetTree,
+    ) -> Self {
+        let title_widget = vui::leaf_widget(widgets::Label::new(title));
         let tree = Arc::new(LayoutTree::Stack {
             direction: Face6::PZ,
             children: vec![
@@ -138,7 +144,24 @@ impl Page {
                 })),
                 vui::leaf_widget(widgets::Frame::with_block(color_block!(0., 0., 0., 0.7))),
                 Arc::new(LayoutTree::Shrink(
-                    theme.dialog_background().as_background_of(contents),
+                    theme
+                        .dialog_background()
+                        .as_background_of(Arc::new(LayoutTree::Stack {
+                            direction: Face6::NY,
+                            children: vec![
+                                Arc::new(LayoutTree::Stack {
+                                    direction: Face6::PX,
+                                    children: if let Some(corner_button) = corner_button {
+                                        // TODO: arrange so that title text is centered if possible
+                                        // (need a new LayoutTree variant or to generalize Stack, but it might help with our HUD too)
+                                        vec![corner_button, title_widget]
+                                    } else {
+                                        vec![title_widget]
+                                    },
+                                }),
+                                contents,
+                            ],
+                        })),
                 )),
             ],
         });