Skip to content

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

#1284: reject Graph Editor ease edits on locked layers

Kristian Myram37e0c5dff62c
diff --git a/crates/engine/src/cmd/anim.rs b/crates/engine/src/cmd/anim.rs
index 1aecf3b5d..11aad5e8b 100644
--- a/crates/engine/src/cmd/anim.rs
+++ b/crates/engine/src/cmd/anim.rs
@@ -352,6 +352,9 @@ fn set_ease(s: &mut Session, p: &Value) -> Result<Value> {
let influence = f_p(p, "influence").map(|v| (v / 100.0).clamp(0.001, 1.0));
s.edit("Keyframe Velocity", merge_p(p), |proj, _| {
let l = super::layer_mut(proj, cid, lid)?;
+ if l.switches.locked {
+ return Err(bad("keys.setEase", "the layer is locked"));
+ }
let pr = l.props.find_mut(uid).ok_or_else(|| bad("keys.setEase", "no property"))?;
let i = nearest_key(&pr.keys, t).ok_or_else(|| bad("keys.setEase", "no keyframes"))?;
let spatial = pr.spatial;
diff --git a/crates/engine/src/tests/timeline.rs b/crates/engine/src/tests/timeline.rs
index 1330f0b09..c96053bf2 100644
--- a/crates/engine/src/tests/timeline.rs
+++ b/crates/engine/src/tests/timeline.rs
@@ -344,6 +344,34 @@ fn graph_editor_key_and_handle_edits() {
assert_eq!(prop(&s, l, "transform/opacity").keys[0].out_interp, Interp::Linear);
}
+#[test]
+fn graph_editor_ease_edits_reject_a_locked_layer() {
+ let (mut s, l) = setup();
+ animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (2.0, json!(0))]);
+ select_prop_keys(&mut s, l, "transform/opacity");
+ s.execute("layer.setSwitch", json!({"layers": [l], "switch": "locked", "value": true})).unwrap();
+ let before = prop(&s, l, "transform/opacity");
+ let selected = s.state.selected_keys.clone();
+ let undo = s.history.undo.len();
+ for side in ["in", "out"] {
+ let error =
+ s.execute("keys.setEase", json!({"layer": l, "path": "transform/opacity", "time": 1.0, "side": side, "speed": 200, "influence": 60})).unwrap_err();
+ assert!(error.to_string().contains("locked"), "{error}");
+ assert_eq!(prop(&s, l, "transform/opacity").keys, before.keys);
+ assert_eq!(s.state.selected_keys, selected);
+ assert_eq!(s.history.undo.len(), undo);
+ }
+ s.execute("layer.setSwitch", json!({"layers": [l], "switch": "locked", "value": false})).unwrap();
+ s.execute("keys.setEase", json!({"layer": l, "path": "transform/opacity", "time": 1.0, "side": "out", "speed": 200, "influence": 60})).unwrap();
+ let after = prop(&s, l, "transform/opacity");
+ assert_eq!(after.keys[1].out_interp, Interp::Bezier);
+ assert_eq!(after.keys[1].out_ease[0].speed, 200.0);
+ s.execute("edit.undo", json!({})).unwrap();
+ assert_eq!(prop(&s, l, "transform/opacity").keys, before.keys);
+ s.execute("edit.redo", json!({})).unwrap();
+ assert_eq!(prop(&s, l, "transform/opacity").keys, after.keys);
+}
+
#[test]
fn convert_expression_to_keyframes_on_a_reversed_layer_keeps_values() {
let (mut s, l) = setup();