diff --git a/crates/layers/src/ui/panel/body.rs b/crates/layers/src/ui/panel/body.rs index 7efceef46..5cc5cc9d2 100644 --- a/crates/layers/src/ui/panel/body.rs +++ b/crates/layers/src/ui/panel/body.rs @@ -30,6 +30,8 @@ pub(super) struct BodyOutput { pub(super) response: egui::Response, /// The layer move a release of the held rows would make, while the option to preview it is on. pub(super) drop_preview: Option>, + /// The layer whose row the list shows hovered. + pub(super) hovered: Option, } /// Shows the list over `rows` and maps what it reports. @@ -78,7 +80,13 @@ pub(super) fn show_body( if let Some(key) = reveal_key { list = list.reveal(key); } + let mut hovered = None; let out = list.show_items(ui, rows, &mut |key, item| { + if item.row.hovered + && let LayerRowKey::Layer(id) = key + { + hovered = Some(id.clone()); + } let row = build_row(cx, key).cells(item.cells()).state(item.row.clone()); match rows.rows.get(item.at) { Some(shown) if shown.has_children => row.depth(shown.paint_depth).group(shown.open), @@ -108,5 +116,5 @@ pub(super) fn show_body( session.anchor = selection.anchor.as_ref().map(|key| LayerRowKey::Layer(key.layer().clone())); session.produced = layers; } - BodyOutput { events, response: out.response, drop_preview } + BodyOutput { events, response: out.response, drop_preview, hovered } } diff --git a/crates/layers/src/ui/panel/mod.rs b/crates/layers/src/ui/panel/mod.rs index 1eca4b24c..8356fd905 100644 --- a/crates/layers/src/ui/panel/mod.rs +++ b/crates/layers/src/ui/panel/mod.rs @@ -177,6 +177,9 @@ pub struct LayersOutput { /// While rows are dragged and Preview on Canvas When Reordering Layers is on, the layer move the release would /// make, for the app's canvas preview; `None` otherwise. pub drop_preview: Option>, + /// The layer whose row is under the pointer, for the app's canvas outline of it (PhotoCraft's Move tool); `None` + /// over an effects or Smart Filter row and away from the rows. + pub hovered: Option, /// The panel. pub response: Response, } @@ -386,12 +389,12 @@ impl<'a, T: LayerTree> LayersPanel<'a, T> { while let Some((key, _)) = stack.take_command::() { reported.extend(key.event(tree)); } - (reported, body.drop_preview) + (reported, body.drop_preview, body.hovered) }); // Only the real run's result comes back, so the reveal's opens and the list's events are reported once. let mut events = events.into_inner(); - let (body, drop_preview) = shown.inner.unwrap_or_default(); + let (body, drop_preview, hovered) = shown.inner.unwrap_or_default(); events.extend(body); - LayersOutput { events, drop_preview, response: shown.output } + LayersOutput { events, drop_preview, hovered, response: shown.output } } }