EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
#360: the Project row menu's New Comp from Selection uses the whole selection
Claudead7df67602c0
diff --git a/crates/ui-egui/src/panels/project.rs b/crates/ui-egui/src/panels/project.rsindex 8f249b780..21f842976 100644--- a/crates/ui-egui/src/panels/project.rs+++ b/crates/ui-egui/src/panels/project.rs@@ -599,12 +599,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {actions.push(("layer.addItem".into(), json!({"item": id.0})));ui.close();}+ // File ▸ New Comp from Selection on the selection (the right-clicked row joins it+ // above): several items ask how in its dialog, as in After Effects (#360).if ui.button(crate::i18n::tr("New Comp from Selection")).clicked() {- if let Some((w, h)) = it.dimensions() {- let d = it.duration().map(|d| d.seconds()).unwrap_or(10.0);- actions.push(("comp.new".into(), json!({"name": format!("{} Comp", it.name), "width": w, "height": h, "duration": d})));- actions.push(("layer.addItem".into(), json!({"item": id.0})));- }+ actions.push(("file.newCompFromSelection".into(), json!({})));ui.close();}ui.separator();diff --git a/crates/ui-egui/tests/ui_project_rows.rs b/crates/ui-egui/tests/ui_project_rows.rsindex 43daf2ed1..4c255cadd 100644--- a/crates/ui-egui/tests/ui_project_rows.rs+++ b/crates/ui-egui/tests/ui_project_rows.rs@@ -148,6 +148,32 @@ fn footage_context_menu_interprets_the_footage() {assert_eq!(h.state().dialog, Some(Dialog::Form), "the Interpret Footage dialog opened");}+/// #360: the row menu's New Comp from Selection works on the whole selection, as File ▸ New+/// Comp from Selection does: with several items selected it asks how in After Effects' New+/// Composition from Selection dialog, and Multiple Compositions makes one per item.+#[test]+fn context_menu_new_comp_from_selection_uses_the_selection() {+ let (mut h, _, comp, solid) = harness();+ h.state_mut().session.state.project_selection = vec![comp, solid];+ h.run_steps(2);+ let at = center(&h, &format!("project.item.{}.name", solid.0));+ h.input_mut().events.push(Event::PointerMoved(at));+ h.step();+ for pressed in [true, false] {+ h.input_mut().events.push(Event::PointerButton { pos: at, button: egui::PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });+ h.step();+ }+ h.run_steps(2);+ assert_eq!(h.state().session.state.project_selection, vec![comp, solid], "the selection stays");+ let item = h.query_by_label_contains("New Comp from Selection").expect("in the menu").rect();+ click_at(&mut h, item.center());+ assert_eq!(h.state().dialog, Some(Dialog::Form));+ assert!(h.state().auto.find("form.field.single").is_some(), "the New Composition from Selection dialog");+ let comps = h.state().session.project.comps().count();+ h.state_mut().session.execute_checked("file.newCompFromSelection", json!({"single": false})).unwrap();+ assert_eq!(h.state().session.project.comps().count(), comps + 2, "one per item");+}+/// Dragging from the Project panel's empty area draws a selection box that selects the rows it/// touches; a click there deselects (#203).#[test]