Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge pull request #893 from vangel76/fix-878-context-menu-selection

Brandon Thomas0ad9b5fc9bf3
diff --cc crates/ui-egui/src/panels/timeline.rs
index ea6579d14,5467b25f1..cbd0b58b1
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@@ -3469,8 -3442,16 +3469,16 @@@ fn prop_menu
item(ui, "essentialGraphics", "Add Property to Essential Graphics", false, "essential.addProperty", json!({"comp": comp.0, "layer": l, "prop": uid}));
}
- fn layer_context_menu(resp: &egui::Response, layer: &Layer, actions: &mut Vec<(String, serde_json::Value)>) {
- crate::widgets::context_menu(&resp, |ui| layer_menu(ui, &[layer.id.0], actions));
+ /// A layer row's or bar's context menu. As in After Effects, right-clicking a layer that is part
+ /// of the selection keeps the selection and the menu acts on all of it; right-clicking an
+ /// unselected layer selects only that layer.
+ fn layer_context_menu(resp: &egui::Response, comp: &Comp, layer: &Layer, selected: &[LayerId], actions: &mut Vec<(String, serde_json::Value)>) {
+ let in_selection = selected.contains(&layer.id);
+ if resp.secondary_clicked() && !in_selection && !layer.switches.locked {
+ actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));
+ }
+ let targets: Vec<u64> = if in_selection { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };
- resp.context_menu(|ui| layer_menu(ui, &targets, actions));
++ crate::widgets::context_menu(&resp, |ui| layer_menu(ui, &targets, actions));
}
/// Shared layer actions for Timeline rows and Composition context menus.