diff --git a/crates/ui-contract/src/contract/items.rs b/crates/ui-contract/src/contract/items.rs index f7b870fe3..a6cce9812 100644 --- a/crates/ui-contract/src/contract/items.rs +++ b/crates/ui-contract/src/contract/items.rs @@ -20,6 +20,7 @@ pub use drag::{SweepApply, SweepStep}; pub use header::ColumnCommands; #[doc(hidden)] pub use header::put_toggle_names; +pub use press::item_part_open; #[doc(hidden)] pub use request::lead_position; pub use request::request_rename; diff --git a/crates/ui-contract/src/contract/items/hooks.rs b/crates/ui-contract/src/contract/items/hooks.rs index b91349702..295fc7f81 100644 --- a/crates/ui-contract/src/contract/items/hooks.rs +++ b/crates/ui-contract/src/contract/items/hooks.rs @@ -6,7 +6,7 @@ use super::members::Member; use super::{Held, ITEM_NODE, ItemsHooks, LastLayout, Lead, Placement, Renaming, Rows, SCROLL, Scrolled, View, key_hash, section_part}; use super::{request, rows}; use crate::contract::ValueOf; -use crate::contract::collection::{CollectionEvent, Gestures, OpenChange, Rename, RowState, ShownRow}; +use crate::contract::collection::{CollectionEvent, ContextMenuRequest, Gestures, OpenChange, Rename, RowState, ShownRow}; use crate::contract::cx::{BodyCx, Pointer as _}; use crate::contract::run::{Measuring, ShapeHooks, ShowAt}; use crate::contract::steps::ShapeKind; @@ -591,6 +591,9 @@ impl ShapeHooks for ItemsHooks<'_, '_, C> { if let Some(ask) = out.open_request() { self.events.push(CollectionEvent::Open(OpenChange { key: key.clone(), open: ask.open, all: ask.all })); } + if let Some(at) = out.menu_request() { + self.events.push(CollectionEvent::ContextMenu(ContextMenuRequest { key: key.clone(), at: self.on_screen(at), column: None })); + } if let Some(event) = out.into_event() { self.events.push(CollectionEvent::Item(key.clone(), event)); } diff --git a/crates/ui-contract/src/contract/items/members.rs b/crates/ui-contract/src/contract/items/members.rs index b97efdc18..13e400379 100644 --- a/crates/ui-contract/src/contract/items/members.rs +++ b/crates/ui-contract/src/contract/items/members.rs @@ -2,7 +2,7 @@ //! arena, updated, painted and finished at their rows, reported as sub-nodes of the collection. use super::{ITEM_NODE, ItemsHooks, key_hash}; -use crate::contract::collection::{CollectionEvent, OpenChange, ShownRow}; +use crate::contract::collection::{CollectionEvent, ContextMenuRequest, OpenChange, ShownRow}; use crate::contract::run; use crate::contract::{Collection, Component as _, Cx, Internal, ItemOpener, ItemOutput as _, Meta as _}; use crate::primitives::sensing::{self, MemberSpec}; @@ -86,6 +86,9 @@ impl<'r, C: Collection> ItemsHooks<'_, 'r, C> { if let Some(ask) = output.open_request() { self.events.push(CollectionEvent::Open(OpenChange { key: key.clone(), open: ask.open, all: ask.all })); } + if let Some(at) = output.menu_request() { + self.events.push(CollectionEvent::ContextMenu(ContextMenuRequest { key: key.clone(), at: self.on_screen(at), column: None })); + } if let Some(event) = output.into_event() { self.events.push(CollectionEvent::Item(key.clone(), event)); } diff --git a/crates/ui-contract/src/contract/items/press.rs b/crates/ui-contract/src/contract/items/press.rs index d0a9e2595..f2f55ba4c 100644 --- a/crates/ui-contract/src/contract/items/press.rs +++ b/crates/ui-contract/src/contract/items/press.rs @@ -300,9 +300,20 @@ impl ItemsHooks<'_, '_, C> { pointer: ctx.pointer_latest_pos(), ..response::MemberView::default() }; - let response = response::member(ui, sub(opener.item, ("opener", opener.part)), rect, enabled, view); + let response = response::member(ui, opener_id(opener.item, opener.part), rect, enabled, view); Some((opener, response)) }) .collect() } } + +/// The id of the response `CollectionResponse::opener` gives for the part `part` of the item `item`. +fn opener_id(item: Id, part: craft_behavior::PartRef) -> Id { + sub(item, ("opener", part)) +} + +/// Whether a menu or popover hung from the part `part` of the item `item` (`ItemCx::part_opener`) is open: an item +/// keeps such a part shown while its menu is. +pub fn item_part_open(ctx: &Context, item: Id, part: impl Into) -> bool { + crate::contract::overlay::container_open::opened_from(ctx, opener_id(item, part.into())) +} diff --git a/crates/ui-contract/src/contract/mod.rs b/crates/ui-contract/src/contract/mod.rs index 9ca659936..f757f79bb 100644 --- a/crates/ui-contract/src/contract/mod.rs +++ b/crates/ui-contract/src/contract/mod.rs @@ -73,7 +73,7 @@ pub use held::Held; pub use items::lead_position; #[doc(hidden)] pub use items::put_toggle_names; -pub use items::{ColumnCommands, SweepApply, SweepStep, request_rename, section_part}; +pub use items::{ColumnCommands, SweepApply, SweepStep, item_part_open, request_rename, section_part}; #[doc(hidden)] pub use label::colon_of; pub use label::{CellWidth, FieldLabelRole, FieldLayout, GlyphLabel, LabelAlign, LabelKind, Scrub, SideLabel}; diff --git a/crates/ui-contract/src/contract/overlay.rs b/crates/ui-contract/src/contract/overlay.rs index aaa42ce46..aa811b6db 100644 --- a/crates/ui-contract/src/contract/overlay.rs +++ b/crates/ui-contract/src/contract/overlay.rs @@ -5,7 +5,7 @@ pub use crate::runtime::overlay::{OpenFilter, any_open, family, is_open, request_close, top}; -mod container_open; +pub(crate) mod container_open; mod dismissal; mod host; mod opener; diff --git a/crates/ui-contract/src/contract/overlay/container_open.rs b/crates/ui-contract/src/contract/overlay/container_open.rs index 28e49f426..165de3212 100644 --- a/crates/ui-contract/src/contract/overlay/container_open.rs +++ b/crates/ui-contract/src/contract/overlay/container_open.rs @@ -56,6 +56,11 @@ pub(crate) fn opener_open(stage: &mut MemoryStage, first: &Opener) -> bool { open } +/// Whether the container hung from the opener `opener` (the id of its response) is open, as its slot holds it. +pub(crate) fn opened_from(ctx: &egui::Context, opener: Id) -> bool { + MemoryStage::peek_session::(ctx, sub(opener, "opens")).open +} + /// Writes the opener's slot: the container closed itself (Escape, a press outside, a row ran). pub(crate) fn set_opener_open(stage: &mut MemoryStage, opener: &Opener, open: bool) { stage.session::(sub(opener.id, "opens")).open = open; diff --git a/crates/ui-contract/src/contract/values.rs b/crates/ui-contract/src/contract/values.rs index 78f0ee4fa..2c4e13a65 100644 --- a/crates/ui-contract/src/contract/values.rs +++ b/crates/ui-contract/src/contract/values.rs @@ -535,6 +535,12 @@ pub trait ItemOutput: Outcome { None } + /// The item asks for its menu from one of its parts (a row's "More" button): where the menu hangs, in the item's + /// layer. The collection reports it as `CollectionEvent::ContextMenu`, as it does a secondary click on the row. + fn menu_request(&self) -> Option { + None + } + /// The rect of the item's label, where a rename editor goes; `None` puts it over the whole row. fn label_rect(&self) -> Option { None diff --git a/crates/ui-contract/src/runtime/memory.rs b/crates/ui-contract/src/runtime/memory.rs index 90ad280a8..b8d81029c 100644 --- a/crates/ui-contract/src/runtime/memory.rs +++ b/crates/ui-contract/src/runtime/memory.rs @@ -368,6 +368,11 @@ impl MemoryStage { store::peek_clone::>(ctx, id).map(|wrapped| wrapped.0).unwrap_or_default() } + /// Read-only access to a session slot, as `peek` does for a shown one. + pub(crate) fn peek_session(ctx: &Context, id: Id) -> T { + store::peek_clone::>(ctx, id).map(|wrapped| wrapped.0).unwrap_or_default() + } + /// Read-only access to a saved slot, as `peek` does for a shown one. #[doc(hidden)] pub fn peek_saved(ctx: &Context, key: &SaveKey) -> T { diff --git a/crates/ui-widgets/src/list/row.rs b/crates/ui-widgets/src/list/row.rs index e738afd63..d74fc0901 100644 --- a/crates/ui-widgets/src/list/row.rs +++ b/crates/ui-widgets/src/list/row.rs @@ -222,6 +222,8 @@ pub struct ListRow<'a> { pub(super) check: Option, pub(super) event: Option, pub(super) open: Option>, + /// The row's menu button was clicked: where the menu hangs. + pub(super) menu: Option, pub(super) label_rect: Rect, } @@ -277,6 +279,7 @@ impl<'a> ListRow<'a> { check: None, event: None, open: None, + menu: None, label_rect: Rect::NOTHING, } .label(label) @@ -434,10 +437,29 @@ impl<'a> ListRow<'a> { !self.trailing.iter().any(|held| matches!(&held.item, TrailingItem::Part { part: have, .. } if *have == part)), "trailing part {part:?} is already in the row" ); - self.trailing.push(Trailing { item: TrailingItem::Part { part, face, name: name.into(), enabled: true }, optional: false }); + self.trailing.push(Trailing { item: TrailingItem::Part { part, face, name: name.into(), enabled: true, revealed: false }, optional: false }); self } + /// A trailing part as [`trailing_part`](Self::trailing_part) adds one, shown only on a hovered or selected row, + /// while it has focus or while the menu it opens (`ItemCx::part_opener`) is open: a row's "More" button. It keeps + /// its place and takes a press where it is hidden. + #[must_use] + pub fn trailing_part_revealed(mut self, part: TrailingPart, face: TrailingFace, name: impl Into