diff --git a/crates/automation/src/ui/actions/body.rs b/crates/automation/src/ui/actions/body.rs index b0618d003..19dcfca8a 100644 --- a/crates/automation/src/ui/actions/body.rs +++ b/crates/automation/src/ui/actions/body.rs @@ -5,8 +5,8 @@ use craft_behavior::{ColumnWidth, EditEvent, IconId, Mixed, Selection}; use craft_theme::variant::Tone; use craft_ui::buttons::Button; use craft_ui::contract::{ - Bind, CollectionEvent, ColumnKey, ColumnKind, ColumnSpec, ListDrag, OpenChange, Outcome as _, Pad, Props as _, ReorderMove, ReorderRule, Scroll, - SelectMode, Show as _, ShowCollection as _, ShowContainer as _, Sizing, SpaceAction, ToggleColumn, ToggleEdit, request_rename, + Bind, CollectionEvent, ColumnKey, ColumnSpec, ListDrag, OpenChange, Outcome as _, Pad, Props as _, ReorderMove, ReorderRule, Scroll, SelectMode, + Show as _, ShowCollection as _, ShowContainer as _, Sizing, SpaceAction, ToggleColumn, ToggleEdit, request_rename, }; use craft_ui::display::Text; use craft_ui::layout_components::{Row, Stack}; @@ -154,10 +154,8 @@ fn show_tree(ui: &mut Ui, body: &Body<'_>, state: &mut ActionsPanelState, sessio request_rename(ui.ctx(), list_id, &ActionSelection::Action(index)); } let columns = vec![ - ColumnSpec::new(INCLUDE_COLUMN, Label::Empty, ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::sweepable())), - ColumnSpec::new(DIALOG_COLUMN, Label::Empty, ColumnWidth::Controls(1.0)) - .kind(ColumnKind::Toggle(ToggleColumn::sweepable())) - .icon(IconId::new("note")), + ColumnSpec::toggle(INCLUDE_COLUMN, Label::Empty, ToggleColumn::sweepable()), + ColumnSpec::toggle(DIALOG_COLUMN, Label::Empty, ToggleColumn::sweepable()).icon(IconId::new("note")), ColumnSpec::new(NAME_COLUMN, Label::Empty, ColumnWidth::fill(1.0)), ]; let mut widget = List::new(words.name.clone()) diff --git a/crates/behavior/src/columns.rs b/crates/behavior/src/columns.rs index ac995a01d..af8ee86ce 100644 --- a/crates/behavior/src/columns.rs +++ b/crates/behavior/src/columns.rs @@ -57,6 +57,9 @@ pub enum ColumnWidth { /// This many control heights; the owner that knows the control height resolves it with /// [`ColumnWidth::in_unit`] before the widths are computed. Controls(f32), + /// As wide as a toggle cell: a control and the inline gap. The owner that knows the control size resolves it + /// before the widths are computed. + Toggle, /// A share of the remaining width, by weight. #[non_exhaustive] Fill { diff --git a/crates/behavior/src/grid.rs b/crates/behavior/src/grid.rs index b592eaae5..9d3e51de5 100644 --- a/crates/behavior/src/grid.rs +++ b/crates/behavior/src/grid.rs @@ -5,8 +5,8 @@ use crate::flow::Flow; use emath::{Pos2, Rect, Vec2}; /// The width of each column in `room`: `Fixed` is the app's width, `Content` the widest child of last pass -/// (`content[i]`, zero when unknown), and `Fill` columns share what is left by weight. `Controls` widths take -/// no room until `ColumnWidth::in_unit` resolves them. +/// (`content[i]`, zero when unknown), and `Fill` columns share what is left by weight. `Controls` and `Toggle` +/// widths take no room until their owner resolves them. pub fn resolve_columns(columns: &[ColumnWidth], content: &[f32], room: f32, gap: f32) -> Vec { let known = |i: usize| content.get(i).copied().unwrap_or(0.0); let mut widths: Vec = columns @@ -14,7 +14,7 @@ pub fn resolve_columns(columns: &[ColumnWidth], content: &[f32], room: f32, gap: .enumerate() .map(|(i, column)| match column { ColumnWidth::Fixed(width) => *width, - ColumnWidth::Fill { .. } | ColumnWidth::Controls(_) => 0.0, + ColumnWidth::Fill { .. } | ColumnWidth::Controls(_) | ColumnWidth::Toggle => 0.0, _ => known(i), }) .collect(); diff --git a/crates/draw/src/ui/brush_settings/sections.rs b/crates/draw/src/ui/brush_settings/sections.rs index f30df71a5..78f1ce6df 100644 --- a/crates/draw/src/ui/brush_settings/sections.rs +++ b/crates/draw/src/ui/brush_settings/sections.rs @@ -3,8 +3,8 @@ use craft_behavior::{ColumnKey, ColumnWidth, DisplayOrder, IconId, ItemSource, Mixed, Selection, SelectionChange, SizeHint, Value}; use craft_keymap::{Chord, Key, Mods}; use craft_ui::contract::{ - ActivateOn, Bind, CollectionEvent, ColumnKind, ColumnSpec, Outcome, Props as _, Remember as _, SelectMode, ShowCollection as _, - ShowContainer as _, Sizing, SpaceAction, SweepApply, SweepStep, ToggleColumn, ToggleEdit, + ActivateOn, Bind, CollectionEvent, ColumnSpec, Outcome, Props as _, Remember as _, SelectMode, ShowCollection as _, ShowContainer as _, Sizing, + SpaceAction, SweepApply, SweepStep, ToggleColumn, ToggleEdit, }; use craft_ui::layout_components::Stack; use craft_ui::list::{ListRow, ToggleCell, ToggleState}; @@ -273,13 +273,10 @@ impl<'a, K: Value + Eq + Hash> BrushSectionList<'a, K> { let lock_name = Label::from(words.lock.fill(&[("name", "{row}")])); let switch_name = Label::from("{row}".to_owned()); let columns = || { - let toggle = ColumnKind::Toggle(ToggleColumn::default()); vec![ - ColumnSpec::new(CHECK, Label::Empty, ColumnWidth::Controls(1.0)).kind(toggle), + ColumnSpec::toggle(CHECK, Label::Empty, ToggleColumn::default()), ColumnSpec::new(NAME, Label::Empty, ColumnWidth::Content), - ColumnSpec::new(LOCK, Label::Empty, ColumnWidth::Controls(1.0)) - .kind(ColumnKind::Toggle(ToggleColumn::default().key(Chord::new(Mods::SHIFT, Key::Space)))) - .icon(IconId::new("lock")), + ColumnSpec::toggle(LOCK, Label::Empty, ToggleColumn::default().key(Chord::new(Mods::SHIFT, Key::Space))).icon(IconId::new("lock")), ] }; let shown_stack = Stack::new().show(ui, |ui, cx| { diff --git a/crates/imaging/src/ui/channels/panel.rs b/crates/imaging/src/ui/channels/panel.rs index 72e0d953b..ba8dc078f 100644 --- a/crates/imaging/src/ui/channels/panel.rs +++ b/crates/imaging/src/ui/channels/panel.rs @@ -8,8 +8,8 @@ use std::hash::Hash; use craft_behavior::geometry::selection_op::SelectionOperation; use craft_behavior::{ColumnKey, ColumnWidth, DisplayOrder, EditEvent, IconId, ItemSource, Selection, SelectionChange}; use craft_ui::contract::{ - Bind, CollectionEvent, ColumnKind, ColumnSpec, ListDrag, Props as _, ReorderRule, ShowCollection as _, ShowContainer as _, SweepApply, - ToggleColumn, request_rename, + Bind, CollectionEvent, ColumnSpec, ListDrag, Props as _, ReorderRule, ShowCollection as _, ShowContainer as _, SweepApply, ToggleColumn, + request_rename, }; use craft_ui::layout_components::Stack; use craft_ui::list::{List, RowEvent, ThumbSize}; @@ -176,9 +176,7 @@ impl<'a, K: Clone + Eq + Hash + Debug + Send + Sync + 'static> ChannelsPanel<'a, let payload_kinds = kinds.clone(); let kind_of = |key: &K| kinds.iter().find(|(k, _)| k == key).map(|(_, kind)| *kind); let columns = vec![ - ColumnSpec::new(EYE, Label::Empty, ColumnWidth::Controls(1.0)) - .kind(ColumnKind::Toggle(ToggleColumn::sweepable())) - .icon(IconId::new("eye")), + ColumnSpec::toggle(EYE, Label::Empty, ToggleColumn::sweepable()).icon(IconId::new("eye")), ColumnSpec::new(NAME, Label::Empty, ColumnWidth::fill(1.0)), ]; let out = List::new(words.list.clone()) diff --git a/crates/imaging/src/ui/filter_gallery/stack.rs b/crates/imaging/src/ui/filter_gallery/stack.rs index dc9bc9080..723d0fc83 100644 --- a/crates/imaging/src/ui/filter_gallery/stack.rs +++ b/crates/imaging/src/ui/filter_gallery/stack.rs @@ -4,8 +4,8 @@ use std::borrow::Cow; use craft_behavior::{ColumnKey, ColumnWidth, DisplayOrder, EditEvent, IconId, ItemSource, Selection}; use craft_ui::contract::{ - CollectionEvent, ColumnKind, ColumnSpec, NoValue, Outcome, Remember as _, ReorderMove, ReorderRule, SelectMode, ShowCollection as _, - ShowContainer as _, SweepApply, SweepStep, ToggleColumn, + CollectionEvent, ColumnSpec, NoValue, Outcome, Remember as _, ReorderMove, ReorderRule, SelectMode, ShowCollection as _, ShowContainer as _, + SweepApply, SweepStep, ToggleColumn, }; use craft_ui::layout_components::Stack; use craft_ui::list::{List, ListRow, RowInk, ToggleCell}; @@ -108,7 +108,7 @@ impl<'a> EffectStack<'a> { let layers = Layers { effects, index }; let mut selection = Selection::single(current); let columns = vec![ - ColumnSpec::new(EYE, words.visibility_of.clone(), ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::sweepable())), + ColumnSpec::toggle(EYE, words.visibility_of.clone(), ToggleColumn::sweepable()), ColumnSpec::new(NAME, words.filter.clone(), ColumnWidth::fill(1.0)), ]; let mut change = None; diff --git a/crates/imaging/src/ui/layer_style/list.rs b/crates/imaging/src/ui/layer_style/list.rs index 544c7f69c..32a43789d 100644 --- a/crates/imaging/src/ui/layer_style/list.rs +++ b/crates/imaging/src/ui/layer_style/list.rs @@ -1,9 +1,9 @@ //! The effect list on the dialog's left. -use craft_behavior::{ColumnKey, ColumnWidth, DisplayOrder, IconId, ItemSource, Selection, SelectionChange}; +use craft_behavior::{ColumnKey, DisplayOrder, IconId, ItemSource, Selection, SelectionChange}; use craft_ui::contract::{ - ActivateOn, Bind, BodyCx, CollectionEvent, ColumnKind, ColumnSpec, CommandSet, Commands as _, Props as _, Remember as _, SelectMode, - ShowCollection as _, Sizing, SpaceAction, SweepApply, SweepStep, ToggleColumn, + ActivateOn, Bind, BodyCx, CollectionEvent, ColumnSpec, CommandSet, Commands as _, Props as _, Remember as _, SelectMode, ShowCollection as _, + Sizing, SpaceAction, SweepApply, SweepStep, ToggleColumn, }; use craft_ui::list::{List, ListRow, RowEvent, RowInk, ToggleCell, ToggleState, TrailingFace, TrailingPart}; use craft_ui::primitives::IconSpec; @@ -143,7 +143,7 @@ pub(super) fn effect_list( let shown = rows.iter().find(|row| row.page() == Some(draft.page)).cloned(); let selection = shown.clone().map_or_else(Selection::default, Selection::single); let source = Rows { rows: &rows, draft }; - let columns = vec![ColumnSpec::new(CHECK, Label::Empty, ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::default()))]; + let columns = vec![ColumnSpec::toggle(CHECK, Label::Empty, ToggleColumn::default())]; let out = List::::new(words.effects.clone()) .select(SelectMode::Single) diff --git a/crates/layers/src/ui/panel/body.rs b/crates/layers/src/ui/panel/body.rs index 4ca30fafd..1aa78cffd 100644 --- a/crates/layers/src/ui/panel/body.rs +++ b/crates/layers/src/ui/panel/body.rs @@ -12,8 +12,7 @@ use rows::{RevealPlan, list_selection}; use craft_behavior::{ColumnWidth, IconId}; use craft_keymap::Mods; use craft_ui::contract::{ - Bind, CollectionEvent, ColumnKind, ColumnSpec, DropAt, DropKind, DropPlace, ListDrag, PendingDrop, Props as _, ReorderRule, ShowCollection as _, - ToggleColumn, + Bind, CollectionEvent, ColumnSpec, DropAt, DropKind, DropPlace, ListDrag, PendingDrop, Props as _, ReorderRule, ShowCollection as _, ToggleColumn, }; use craft_ui::list::List; use craft_ui::runtime::env::Label; @@ -58,13 +57,9 @@ pub(super) fn show_body( }); let eye = cx.visibility_key.map_or(ToggleColumn::sweepable(), |key| ToggleColumn::sweepable().key(key)); - let mut columns = vec![ColumnSpec::new(EYE, Label::Empty, ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(eye)).icon(IconId::new("eye"))]; + let mut columns = vec![ColumnSpec::toggle(EYE, Label::Empty, eye).icon(IconId::new("eye"))]; if cx.lock_column { - columns.push( - ColumnSpec::new(LOCK, Label::Empty, ColumnWidth::Controls(1.0)) - .kind(ColumnKind::Toggle(ToggleColumn::sweepable())) - .icon(IconId::new("lock")), - ); + columns.push(ColumnSpec::toggle(LOCK, Label::Empty, ToggleColumn::sweepable()).icon(IconId::new("lock"))); } columns.push(ColumnSpec::new(NAME, Label::Empty, ColumnWidth::fill(1.0))); let parent_of = |id: &T::Id| tree.parent(id); diff --git a/crates/pages/src/ui/list.rs b/crates/pages/src/ui/list.rs index 56cd5a2ae..b6498c983 100644 --- a/crates/pages/src/ui/list.rs +++ b/crates/pages/src/ui/list.rs @@ -25,8 +25,8 @@ mod stories; use craft_behavior::{ColumnKey, ColumnWidth, EditEvent, IconId, Mixed, Selection, SelectionChange, keyed}; use craft_ui::contract::{ - Bind, CollectionEvent, ColumnKind, ColumnSpec, ContextMenuRequest, ListDrag, NoValue, Outcome, ReorderMove, ReorderRule, SelectMode, - ShowCollection as _, ShowContainer as _, SweepApply, SweepStep, ToggleColumn, ToggleEdit, request_rename, + Bind, CollectionEvent, ColumnSpec, ContextMenuRequest, ListDrag, NoValue, Outcome, ReorderMove, ReorderRule, SelectMode, ShowCollection as _, + ShowContainer as _, SweepApply, SweepStep, ToggleColumn, ToggleEdit, request_rename, }; use craft_ui::list::{ListRow, RowEvent, ToggleCell, TrailingFace, TrailingPart}; use craft_ui::primitives::IconSpec; @@ -230,8 +230,8 @@ impl<'a> PageList<'a> { // With several rows picked the field opens empty, so the typed name goes to all of them. let several = (picked.items.len() > 1).then(|| picked.items.clone()); let columns = vec![ - ColumnSpec::new(VISIBLE, words.visible.clone(), ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::sweepable())), - ColumnSpec::new(LOCKED, words.lock.clone(), ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::sweepable())), + ColumnSpec::toggle(VISIBLE, words.visible.clone(), ToggleColumn::sweepable()), + ColumnSpec::toggle(LOCKED, words.lock.clone(), ToggleColumn::sweepable()), ColumnSpec::new(NAME, words.name.clone(), ColumnWidth::fill(1.0)), ]; let events = RefCell::new(Vec::new()); diff --git a/crates/table/src/ui/fields.rs b/crates/table/src/ui/fields.rs index cb5fb2a60..a94e17f20 100644 --- a/crates/table/src/ui/fields.rs +++ b/crates/table/src/ui/fields.rs @@ -8,8 +8,8 @@ use std::sync::Arc; use craft_behavior::{ColumnKey, ColumnWidth, DisplayOrder, EditEvent, IconId, ItemSource, Mixed}; use craft_ui::buttons::Button; use craft_ui::contract::{ - CollectionEvent, ColumnKind, ColumnSpec, DropAt, DropKind, DropPlace, ListDrag, Pattern, Props as _, Remember, ReorderMove, ReorderRule, - RowAlign, Show as _, ShowCollection as _, ShowContainer as _, SweepApply, SweepStep, ToggleColumn, Trigger, clicked, + CollectionEvent, ColumnSpec, DropAt, DropKind, DropPlace, ListDrag, Pattern, Props as _, Remember, ReorderMove, ReorderRule, RowAlign, Show as _, + ShowCollection as _, ShowContainer as _, SweepApply, SweepStep, ToggleColumn, Trigger, clicked, }; use craft_ui::display::{Divider, Shade, Text}; use craft_ui::layout_components::{Grid, Row, Stack}; @@ -493,7 +493,7 @@ impl Model<'_> { /// The checklist of source fields. fn checklist(&self, ui: &mut Ui, cx: &mut impl Remember, edits: &Edits) { let source = Checklist { fields: self.fields, ticked: self.fields.iter().map(|field| self.ticked(&field.name)).collect() }; - let columns = vec![ColumnSpec::new(CHECK, Label::Empty, ColumnWidth::Controls(1.0)).kind(ColumnKind::Toggle(ToggleColumn::sweepable()))]; + let columns = vec![ColumnSpec::toggle(CHECK, Label::Empty, ToggleColumn::sweepable())]; let separator = self.words.samples_separator.as_str(); let out = List::::new(self.words.choose.clone()).max_rows(8).columns(columns).header(false).show_items(ui, &source, &mut |key, icx| { diff --git a/crates/ui-contract/src/contract/collection/columns.rs b/crates/ui-contract/src/contract/collection/columns.rs index f93710b76..4293265d6 100644 --- a/crates/ui-contract/src/contract/collection/columns.rs +++ b/crates/ui-contract/src/contract/collection/columns.rs @@ -116,6 +116,11 @@ impl ColumnSpec { } } + /// A toggle column as wide as a toggle cell, with a header; the other settings off. + pub fn toggle(key: ColumnKey, header: impl Into