From 83e0dc788b7bfb6547b168dcbfd7dcab932823d8 Mon Sep 17 00:00:00 2001 From: aiongg Date: Wed, 11 Nov 2026 22:14:16 +0000 Subject: [PATCH] Radio and RadioGroup stories: the old zoom choice and the unit groups The default stories show a column of options with a long wrapping label and disabled options, and two unit groups side by side; members spread over nested layouts keep their own story. --- crates/ui-widgets/src/choice/radio/stories.rs | 83 ++++++++++++++++++- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/crates/ui-widgets/src/choice/radio/stories.rs b/crates/ui-widgets/src/choice/radio/stories.rs index 543cf155f..6dedd82ad 100644 --- a/crates/ui-widgets/src/choice/radio/stories.rs +++ b/crates/ui-widgets/src/choice/radio/stories.rs @@ -2,12 +2,19 @@ use super::{Radio, RadioGroup}; use crate::contract::{Bind, FieldLayout, Props as _, Show as _, ShowContainer as _, SideLabel, Validity}; +use crate::display::{Shade, Text}; use crate::layout_components::{Row, Stack}; use crate::runtime::env::Message; use crate::testing::{Drive, Fixture, StoryData, StoryOutput, story}; use craft_behavior::{IconId, Mixed}; use egui::{Response, Ui}; +/// A label too long for one line of the card: it wraps, the button on its first line. +const LONG_LABEL: &str = "Show the transform controls on the selected layer whenever the move tool is active"; + +/// The unit names of the groups story. +const UNITS: [&str; 5] = ["Pixels", "Millimetres", "Inches", "Points", "Picas"]; + /// Members spread over nested layouts, with the group's body between them: one group, one value. fn spread(ui: &mut Ui, group: RadioGroup<'_, u8>) -> (StoryOutput, Option) { let mut second = None; @@ -23,26 +30,71 @@ fn spread(ui: &mut Ui, group: RadioGroup<'_, u8>) -> (StoryOutput, Option) -> StoryOutput { + group + .show(ui, |ui, _| { + Stack::new().show(ui, |ui, _| { + for (value, label) in [(1u8, "Small"), (2, "Medium"), (3, "Large")] { + Radio::new(value).label(label).show(ui); + } + }); + }) + .into() +} + fn pick_second(fixture: &mut Fixture) { if let Some(medium) = fixture.by_label("Medium") { fixture.click(&medium); } } -#[story(RadioGroup<'static, u8>, covers = [Default], drive = Drive::Custom(pick_second))] +fn pick_millimetres(fixture: &mut Fixture) { + if let Some(millimetres) = fixture.by_label("Millimetres") { + fixture.click(&millimetres); + } +} + +/// Groups of three and five units side by side, the fifth group's Points disabled, and what each picked. +#[story(RadioGroup<'static, u8>, covers = [Default], drive = Drive::Custom(pick_millimetres))] fn radio_group(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { + let mut output = StoryOutput::default(); + Stack::new().show(ui, |ui, _| { + Row::new().show(ui, |ui, _| { + for (count, key, first) in [(3usize, "three", 0u8), (5, "five", 2)] { + let shown = RadioGroup::new(format!("Units ({count})"), Bind::bound(data.value(key, first))).show(ui, |ui, _| { + Stack::new().show(ui, |ui, _| { + for (at, unit) in UNITS.iter().take(count).enumerate() { + Radio::new(at as u8).label(*unit).enabled(at != 3).show(ui); + } + }); + }); + if count == 3 { + output = shown.into(); + } + } + }); + let [three, five] = [*data.value("three", 0u8), *data.value("five", 2u8)].map(|at| UNITS[usize::from(at)]); + Text::new(format!("Selected: {three}, {five}")).shade(Shade::Muted).show(ui); + }); + output +} + +/// Members in nested layouts: the first alone, the others in a row inside the group's body. +#[story(RadioGroup<'static, u8>, covers = [], drive = Drive::Custom(pick_second))] +fn radio_group_nested(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { spread(ui, RadioGroup::new("Size", Bind::bound(data.value("size", 1u8)))).0 } #[story(RadioGroup<'static, u8>, covers = [Mixed], drive = Drive::Never)] fn radio_group_mixed(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { - spread(ui, RadioGroup::new("Size", Bind::bound_mixed(data.value("mixed", Mixed::Mixed)))).0 + column(ui, RadioGroup::new("Size", Bind::bound_mixed(data.value("mixed", Mixed::Mixed)))) } #[story(RadioGroup<'static, u8>, covers = [Invalid], drive = Drive::Never)] fn radio_group_invalid(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { let refuse_large = |size: &u8| if *size == 3 { Validity::Refuse(Message::new("Too large")) } else { Validity::Ok }; - spread(ui, RadioGroup::new("Size", Bind::bound(data.value("large", 3u8)).check(refuse_large))).0 + column(ui, RadioGroup::new("Size", Bind::bound(data.value("large", 3u8)).check(refuse_large))) } /// Rows that carry an icon and a count through the body's label step, the label after the button. @@ -75,7 +127,30 @@ fn radio_group_with_descriptions(ui: &mut Ui, data: &mut StoryData) -> StoryOutp } // The shown member is the selected one, where Tab arrives, so the key drives reach it. +/// A zoom choice: an option with a value beside it, a long label, a disabled option, and a disabled group, picked +/// and not. #[story(Radio, covers = [Default])] fn radio(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { - spread(ui, RadioGroup::new("Size", Bind::bound(data.value("size", 2u8)))).1.map(StoryOutput::from).unwrap_or_default() + let mut selected = None; + Stack::new().show(ui, |ui, _| { + let zoom = Bind::bound(data.value("zoom", 0u8)); + RadioGroup::new("Zoom", zoom).show(ui, |ui, _| { + Stack::new().show(ui, |ui, _| { + selected = Some(Radio::new(0u8).label("Fit to window").show(ui)); + Row::new().show(ui, |ui, _| { + Radio::new(1u8).label("Actual size").show(ui); + Text::new("100 %").shade(Shade::Muted).show(ui); + }); + Radio::new(2u8).label(LONG_LABEL).show(ui); + Radio::new(3u8).label("Print size (no printer)").enabled(false).show(ui); + }); + }); + RadioGroup::new("Disabled", Bind::bound(data.value("disabled", 0u8))).enabled(false).show(ui, |ui, _| { + Stack::new().show(ui, |ui, _| { + Radio::new(0u8).label("Disabled (selected)").show(ui); + Radio::new(1u8).label("Disabled").show(ui); + }); + }); + }); + selected.map(StoryOutput::from).unwrap_or_default() }