mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
fix(engine): a recorded several-layer Free Transform replays on the selection
The canvas box commits `edit.transform` with the `layers` it opened on, and the Action recorder kept those ids verbatim, so replaying in another document failed with NoLayer or moved unrelated layers. When the listed layers are the ones the selection gives the command, the recorded step drops `layers` and replays on the layers selected then; other explicit lists keep their ids. Claude-Session: https://claude.ai/code/session_01D8r6W6haR5FWJyxUakMEfA
This commit is contained in:
1 parent
f3e66beea6
commit
254e501de9
3 files changed
+73
-4
No files matched your search
@@ -211,6 +211,9 @@ pub(crate) fn recorded_step(s: &Session, id: &str, p: Value, pre_selected: Optio
|
||||
if id == "layer.moveTo" {
|
||||
return recorded_move(s, p, pre_selected);
|
||||
}
|
||||
if id == "edit.transform" {
|
||||
return recorded_transform(s, p, pre_selected);
|
||||
}
|
||||
let Some(layer_id) = p.get("layer").and_then(Value::as_u64).map(LayerId) else { return p };
|
||||
let is_sole_selected = match pre_selected {
|
||||
Some(sel) => sel == [layer_id],
|
||||
@@ -226,6 +229,27 @@ pub(crate) fn recorded_step(s: &Session, id: &str, p: Value, pre_selected: Optio
|
||||
p
|
||||
}
|
||||
|
||||
/// A Free Transform of several layers lists their ids (the box's session keeps them while it is
|
||||
/// open). When they are the layers the selection gave it, the step drops `layers`, so it replays on
|
||||
/// the layers selected then, in any document, rather than on these ids (#6501).
|
||||
fn recorded_transform(s: &Session, mut p: Value, pre_selected: Option<&[LayerId]>) -> Value {
|
||||
let Some(st) = s.active() else { return p };
|
||||
let Some(listed) = p.get("layers").and_then(Value::as_array) else { return p };
|
||||
let Some(listed) = listed.iter().map(|v| v.as_u64().map(LayerId)).collect::<Option<Vec<_>>>() else { return p };
|
||||
let selected = pre_selected.map_or_else(|| st.selected_layers(), <[LayerId]>::to_vec);
|
||||
let mut moved = top_level(&st.doc, &listed);
|
||||
let mut targets = crate::transform_cmds::targets_of(&st.doc, &selected, st.active_layer);
|
||||
moved.sort_unstable();
|
||||
moved.dedup();
|
||||
targets.sort_unstable();
|
||||
if moved == targets
|
||||
&& let Some(fields) = p.as_object_mut()
|
||||
{
|
||||
fields.remove("layers");
|
||||
}
|
||||
p
|
||||
}
|
||||
|
||||
fn selection_target(s: &Session, p: &Value) -> Result<LayerId> {
|
||||
let Some(name) = p.get("name") else {
|
||||
if p.get("occurrence").is_some() {
|
||||
|
||||
@@ -268,12 +268,17 @@ pub fn locked_for_transform(doc: &Document, id: LayerId) -> bool {
|
||||
/// the Background, which Show Transform Controls doesn't frame either. With one layer selected (or
|
||||
/// only the Background besides it), that layer; the active layer when nothing else is.
|
||||
pub fn selection_targets(st: &crate::DocState) -> Vec<LayerId> {
|
||||
let selected = st.selected_layers();
|
||||
targets_of(&st.doc, &st.selected_layers(), st.active_layer)
|
||||
}
|
||||
|
||||
/// [`selection_targets`] for the layers `selected`, `active` the active one: what an `edit.transform`
|
||||
/// without `layer` or `layers` moves, so a recorded step can drop a `layers` list that matches it.
|
||||
pub(crate) fn targets_of(doc: &Document, selected: &[LayerId], active: Option<LayerId>) -> Vec<LayerId> {
|
||||
if selected.len() < 2 {
|
||||
return st.active_layer.into_iter().collect();
|
||||
return active.into_iter().collect();
|
||||
}
|
||||
let ids: Vec<LayerId> = crate::layer_multi_cmds::top_level(&st.doc, &selected).into_iter().filter(|id| !st.doc.is_background(*id)).collect();
|
||||
if ids.is_empty() { st.active_layer.into_iter().collect() } else { ids }
|
||||
let ids: Vec<LayerId> = crate::layer_multi_cmds::top_level(doc, selected).into_iter().filter(|id| !doc.is_background(*id)).collect();
|
||||
if ids.is_empty() { active.into_iter().collect() } else { ids }
|
||||
}
|
||||
|
||||
/// The `layers` param: the layers one box transforms together (at most 10000, each in the
|
||||
|
||||
@@ -241,3 +241,43 @@ fn straighten_layer_rotates_every_selected_layer() {
|
||||
assert!(bounds(&s, paint) != p0);
|
||||
assert_eq!(text_matrix(&s, text), m0, "an unselected layer stays put");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_recorded_transform_of_the_selected_layers_replays_on_the_selection_in_another_document() {
|
||||
let (mut s, paint, text) = two_layers();
|
||||
s.execute("actions.record", json!({"name": "Move both"})).unwrap();
|
||||
// What the canvas box commits: the ids it opened on, listed (#6501).
|
||||
s.execute("edit.transform", json!({"layers": [paint.0, text.0], "matrix": [1, 0, 0, 1, 30, 40]})).unwrap();
|
||||
s.execute("actions.stop", json!({})).unwrap();
|
||||
let step = s.actions.list[0].steps[0].1.clone();
|
||||
assert!(step.get("layers").is_none(), "the step plays on the selection, not on these ids: {step}");
|
||||
// Another document, its ids shifted by an extra layer under the two that get selected.
|
||||
s.execute("file.new", json!({"width": 200, "height": 200, "background": "white"})).unwrap();
|
||||
let spare = LayerId(s.execute("layer.new.layer", json!({"name": "Spare"})).unwrap()["layer"].as_u64().unwrap());
|
||||
let a = LayerId(s.execute("layer.new.layer", json!({"name": "A"})).unwrap()["layer"].as_u64().unwrap());
|
||||
let b = LayerId(s.execute("layer.new.layer", json!({"name": "B"})).unwrap()["layer"].as_u64().unwrap());
|
||||
assert_ne!((a, b), (paint, text), "the ids differ from the recorded ones");
|
||||
s.edit("paint", |doc, _| {
|
||||
for (id, x) in [(spare, 100), (a, 10), (b, 60)] {
|
||||
doc.layer_mut(id).unwrap().surface_mut().unwrap().fill_rect(Rect::new(x, 10, x + 20, 30), &[0.0, 0.0, 1.0, 1.0]);
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
s.execute("layer.select", json!({"layer": a.0})).unwrap();
|
||||
s.execute("layer.select", json!({"layer": b.0, "mode": "add"})).unwrap();
|
||||
let (a0, b0, spare0) = (bounds(&s, a), bounds(&s, b), bounds(&s, spare));
|
||||
let r = s.execute("actions.play", json!({"action": 0})).unwrap();
|
||||
assert!(r.get("failed").is_none(), "{r}");
|
||||
assert_eq!((bounds(&s, a), bounds(&s, b)), (a0.translate(30, 40), b0.translate(30, 40)), "the selected layers moved");
|
||||
assert_eq!(bounds(&s, spare), spare0, "the unselected layer stayed");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_recorded_transform_of_other_layers_than_the_selection_keeps_their_ids() {
|
||||
let (mut s, paint, _) = two_layers();
|
||||
s.execute("actions.record", json!({"name": "Paint only"})).unwrap();
|
||||
s.execute("edit.transform", json!({"layers": [paint.0], "matrix": [1, 0, 0, 1, 5, 0]})).unwrap();
|
||||
s.execute("actions.stop", json!({})).unwrap();
|
||||
assert_eq!(s.actions.list[0].steps[0].1["layers"], json!([paint.0]));
|
||||
}
|
||||
Reference in new issue
Block a user