diff --git a/crates/ui-panels/src/docking/iconic/stories.rs b/crates/ui-panels/src/docking/iconic/stories.rs index fc56451c5..e3d6fd602 100644 --- a/crates/ui-panels/src/docking/iconic/stories.rs +++ b/crates/ui-panels/src/docking/iconic/stories.rs @@ -3,32 +3,50 @@ use super::CELL; use crate::buttons::Button; use crate::contract::ShowContainer as _; -use crate::contract::{Bind, Show as _, Validity}; -use crate::docking::{GroupAt, IconicColumn, PanelSpec}; -use crate::runtime::env::Message; +use crate::contract::{Bind, BodyCx, Show as _, Validity}; +use crate::docking::{GroupAt, IconicColumn, IconicColumnOutput, PanelSpec}; +use crate::runtime::env::{Env, Message}; use crate::sections::Panel; use crate::testing::memory::global; -use crate::testing::{Drive, Fixture, StoryData, StoryOutput, story}; +use crate::testing::{Drive, Fixture, StoryData, StoryOutput, stage, story}; use craft_behavior::Mixed; -use craft_behavior::dock::{Column, Group}; -use egui::Ui; +use craft_behavior::dock::{Column, DockEdge, Group}; +use egui::{Rect, Ui}; /// Panels without icons, so each cell shows the first letter of its panel's name. fn spec(panel: &u8) -> PanelSpec { PanelSpec::new(["Brushes", "Swatches", "History"].get(usize::from(*panel)).copied().unwrap_or("Panel")) } +/// Shows `column` as a dock shows it: at the end edge of a stage, as wide as the rail, its flyouts opening over the +/// stage. +fn at_stage<'a>( + ui: &mut Ui, + column: IconicColumn<'a, u8>, + view: impl FnMut(&Group, GroupAt, &mut Ui, &mut BodyCx<'_>) -> Option + 'a, +) -> IconicColumnOutput { + let room = stage(ui); + let env = Env::of(ui); + let width = env.tokens.tokens().size.rail.width; + let cell = if env.direction.is_rtl() { + Rect::from_min_max(room.min, egui::pos2(room.left() + width, room.bottom())) + } else { + Rect::from_min_max(egui::pos2(room.right() - width, room.top()), room.max) + }; + column.edge(DockEdge::End).within(room).show_flyouts_at(ui, cell, view) +} + #[story(IconicColumn<'static, u8>, covers = [Default], drive = Drive::Never)] fn icon_groups(ui: &mut Ui, _: &mut StoryData) -> StoryOutput { let column = Column::new(vec![Group::new(vec![0, 1], 0), Group::new(vec![2], 0)]); - IconicColumn::new("Panels", global("iconic column", "story"), &column, Bind::kept(), &spec) - .show_flyouts(ui, |group, at, ui, _| { - let GroupAt::Show(rect) = at else { return None }; - let title = group.active_panel().map_or_else(String::new, |panel| spec(panel).label.as_str().to_owned()); - Panel::new(title).titled().show_at(ui, rect, |_, _| ()); - None - }) - .into() + let column = IconicColumn::new("Panels", global("iconic column", "story"), &column, Bind::kept(), &spec); + at_stage(ui, column, |group, at, ui, _| { + let GroupAt::Show(rect) = at else { return None }; + let title = group.active_panel().map_or_else(String::new, |panel| spec(panel).label.as_str().to_owned()); + Panel::new(title).titled().show_at(ui, rect, |_, _| ()); + None + }) + .into() } /// A click on the first icon opens the flyout of its panel, which the bound value then names. @@ -43,40 +61,40 @@ fn open_first_flyout(fixture: &mut Fixture) { fn icon_flyout_open(ui: &mut Ui, data: &mut StoryData) -> StoryOutput { let open = data.value("open", None::); let column = Column::new(vec![Group::new(vec![0, 1], 0), Group::new(vec![2], 0)]); - IconicColumn::new("Panels", global("iconic column", "open story"), &column, Bind::bound(open), &spec) - .show_flyouts(ui, |group, at, ui, _| { - let GroupAt::Show(rect) = at else { return None }; - let title = group.active_panel().map_or_else(String::new, |panel| spec(panel).label.as_str().to_owned()); - Panel::new(title).titled().show_at(ui, rect, |_, _| ()); - None - }) - .into() + let column = IconicColumn::new("Panels", global("iconic column", "open story"), &column, Bind::bound(open), &spec); + at_stage(ui, column, |group, at, ui, _| { + let GroupAt::Show(rect) = at else { return None }; + let title = group.active_panel().map_or_else(String::new, |panel| spec(panel).label.as_str().to_owned()); + Panel::new(title).titled().show_at(ui, rect, |_, _| ()); + None + }) + .into() } /// A flyout whose content has a focusable control: it takes Tab and its click, and mirrors under right-to-left. #[story(IconicColumn<'static, u8>, covers = [Open], drive = Drive::Custom(open_first_flyout))] fn icon_flyout_control(ui: &mut Ui, _: &mut StoryData) -> StoryOutput { let column = Column::new(vec![Group::new(vec![0, 1], 0)]); - IconicColumn::new("Panels", global("iconic column", "control story"), &column, Bind::kept(), &spec) - .show_flyouts(ui, |_, at, ui, _| { - let GroupAt::Show(rect) = at else { return None }; - Panel::new("Panel").show_at(ui, rect, |ui, _| { - Button::new("Apply").show(ui); - }); - None - }) - .into() + let column = IconicColumn::new("Panels", global("iconic column", "control story"), &column, Bind::kept(), &spec); + at_stage(ui, column, |_, at, ui, _| { + let GroupAt::Show(rect) = at else { return None }; + Panel::new("Panel").show_at(ui, rect, |ui, _| { + Button::new("Apply").show(ui); + }); + None + }) + .into() } fn flyout_of(ui: &mut Ui, open: Bind<'_, Option>) -> StoryOutput { let column = Column::new(vec![Group::new(vec![0, 1], 0)]); - IconicColumn::new("Panels", global("iconic column", "value story"), &column, open, &spec) - .show_flyouts(ui, |_, at, ui, _| { - let GroupAt::Show(rect) = at else { return None }; - Panel::new("Panel").show_at(ui, rect, |_, _| ()); - None - }) - .into() + let column = IconicColumn::new("Panels", global("iconic column", "value story"), &column, open, &spec); + at_stage(ui, column, |_, at, ui, _| { + let GroupAt::Show(rect) = at else { return None }; + Panel::new("Panel").show_at(ui, rect, |_, _| ()); + None + }) + .into() } #[story(IconicColumn<'static, u8>, covers = [Mixed], drive = Drive::Never)]