EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge pull request #1017 from marcoarnulfo/feat/layer-context-add-marker
Brandon Thomasc4a162b2dc7e
diff --cc crates/ui-egui/tests/ui_blank_context_menus.rsindex c1533fa31,e6fc87b2c..96789fe7f--- a/crates/ui-egui/tests/ui_blank_context_menus.rs+++ b/crates/ui-egui/tests/ui_blank_context_menus.rs@@@ -227,35 -227,31 +227,64 @@@ fn context_menu_rows_leave_no_gap_betwesnapshot(&mut h, "project-rows");}+/// The layer context menu offers the whole effect palette as an "Effects" submenu (synced with+/// the Effect menu), between Blending Mode and Arrange; picking an effect applies it.+#[test]+fn timeline_layer_context_menu_has_the_effects_submenu_and_applies_an_effect() {+ let mut h = harness();+ let layer = h.state_mut().session.execute("layer.newNull", json!({"name": "Null"})).unwrap()["layer"].as_u64().unwrap();+ h.run_steps(3);+ let r = rect(&h, &format!("timeline.layer.{layer}.row"));+ right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));+ // The palette sits between Blending Mode and Arrange, as After Effects' layer menu does.+ let blending = h.get_by_label("Blending Mode ⏵").rect();+ let effects = h.get_by_label("Effects ⏵").rect();+ let arrange = h.get_by_label("Arrange ⏵").rect();+ assert!(blending.bottom() <= effects.top() && effects.bottom() <= arrange.top(), "Effects between Blending Mode and Arrange");+ h.get_by_label("Effects ⏵").click();+ h.run_steps(3);+ h.get_by_label("Blur & Sharpen ⏵").click();+ h.run_steps(3);+ h.get_by_label("Gaussian Blur").click();+ h.run_steps(3);+ let names: Vec<String> = h+ .state()+ .session+ .active_comp()+ .unwrap()+ .layer(effectcraft_engine::project::LayerId(layer))+ .unwrap()+ .effects()+ .map(|f| f.groups().map(|g| g.name.clone()).collect())+ .unwrap_or_default();+ assert_eq!(names, ["Gaussian Blur"]);+}+++ /// #976: a layer's context menu has After Effects' Markers ▸ Add Marker, which marks the layer that+ /// was right-clicked (not the one selected before, and not the composition) at the current time.+ #[test]+ fn layer_context_menu_adds_a_layer_marker() {+ let mut h = harness();+ let solid = |h: &mut Harness<'_, EffectcraftApp>, name: &str| -> u64 {+ h.state_mut().session.execute("layer.newSolid", json!({"name": name, "color": "#406080"})).unwrap()["layer"].as_u64().unwrap()+ };+ let (below, top) = (solid(&mut h, "Below"), solid(&mut h, "Top"));+ h.state_mut().session.execute("layer.select", json!({"layers": [below]})).unwrap();+ h.state_mut().session.execute("time.set", json!({"time": 1.5})).unwrap();+ h.run_steps(3);+ let r = rect(&h, &format!("timeline.layer.{top}.row"));+ right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));+ h.get_by_label("Markers ⏵").click();+ h.run_steps(3);+ snapshot(&mut h, "layer-markers");+ h.get_by_label("Add Marker").click();+ h.run_steps(3);+ let now = h.state().session.time().seconds();+ let comp = h.state().session.active_comp().unwrap();+ let markers = |id: u64| -> Vec<f64> { comp.layer(effectcraft_engine::project::LayerId(id)).unwrap().markers.iter().map(|m| m.time.seconds()).collect() };+ assert_eq!(markers(top), vec![now]);+ assert!((now - 1.5).abs() < 0.01, "at the current time: {now}");+ assert!(markers(below).is_empty(), "{:?}", markers(below));+ assert!(comp.markers.is_empty(), "no composition marker");+ assert_eq!(h.state().session.history.undo.last().map(|u| u.0.as_str()), Some("Add Marker"));+ }