mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-27 03:17:05 -06:00
David MannandClaude Opus 5.5
4dcb2e4088
Selecting a layer is not a history step, so each state kept the target it had when it was created. Undoing a step therefore jumped back to whatever was selected when the previous step was taken: rasterize a shape with the Background active, select the rasterized layer, paint, Ctrl+Z, and the Background became active again. The state a step leaves behind now targets what was selected just before the step (Session::edit and compound steps set the current state's target before recording), as in Photoshop: undo of a stroke or fill keeps the painted layer, undo of New Layer or Merge goes back to the layers selected before it. Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
59 lines
2.7 KiB
Rust
59 lines
2.7 KiB
Rust
//! Undoing a paint stroke keeps the painted layer active (#1356), as in Photoshop: selecting a
|
|
//! layer is not a history step, so the state a step leaves behind targets what was selected just
|
|
//! before the step, not what was selected when the state before it was made.
|
|
|
|
use photocraft_doc::LayerId;
|
|
use photocraft_engine::Session;
|
|
use serde_json::json;
|
|
|
|
fn target(s: &Session) -> (Option<LayerId>, Vec<LayerId>) {
|
|
let st = s.active().unwrap();
|
|
(st.active_layer, st.selected_layers.clone())
|
|
}
|
|
|
|
fn one(id: LayerId) -> (Option<LayerId>, Vec<LayerId>) {
|
|
(Some(id), vec![id])
|
|
}
|
|
|
|
#[test]
|
|
fn undoing_a_stroke_on_a_rasterized_shape_keeps_it_active() {
|
|
let mut s = Session::new();
|
|
s.execute("file.new", json!({"width": 64, "height": 64})).unwrap();
|
|
let bg = s.active().unwrap().doc.layers[0].id;
|
|
let id = LayerId(s.execute("shape.create", json!({"kind": "ellipse", "rect": [4, 4, 40, 30]})).unwrap()["layer"].as_u64().unwrap());
|
|
// Rasterize the shape layer while the Background is the active layer (Layers panel context
|
|
// menu), then select the rasterized layer and paint on it.
|
|
s.execute("layer.select", json!({"layer": bg.0})).unwrap();
|
|
s.execute("layer.rasterize.layer", json!({"layer": id.0})).unwrap();
|
|
s.execute("layer.select", json!({"layer": id.0})).unwrap();
|
|
s.execute("paint.stroke", json!({"points": [[4, 40], [60, 40]], "size": 6})).unwrap();
|
|
assert!(s.undo());
|
|
assert_eq!(target(&s), one(id), "undo of the stroke left the painted layer (background is {bg:?})");
|
|
assert!(s.redo());
|
|
assert_eq!(target(&s), one(id), "redo targets the painted layer");
|
|
// Undoing the stroke and then the rasterize goes back to what was active before each step.
|
|
assert!(s.undo());
|
|
assert!(s.undo());
|
|
assert_eq!(target(&s), one(bg), "the rasterize was taken with the background active");
|
|
}
|
|
|
|
#[test]
|
|
fn undoing_a_fill_keeps_the_filled_layer_active() {
|
|
let mut s = Session::new();
|
|
s.execute("file.new", json!({"width": 16, "height": 16})).unwrap();
|
|
let bg = s.active().unwrap().doc.layers[0].id;
|
|
s.execute("layer.new.layer", json!({})).unwrap();
|
|
let new = target(&s).0.unwrap();
|
|
s.execute("layer.select", json!({"layer": bg.0})).unwrap();
|
|
s.execute("edit.fill", json!({"color": "#ff0000"})).unwrap();
|
|
assert!(s.undo());
|
|
assert_eq!(target(&s), one(bg), "the fill was on the background");
|
|
// Undoing New Layer still goes back to the layer active before it.
|
|
assert!(s.undo());
|
|
assert_eq!(target(&s), one(bg));
|
|
// Redo returns New Layer's state as it was left: the background had been selected in it.
|
|
assert!(s.redo());
|
|
assert_eq!(target(&s), one(bg));
|
|
assert!(s.active().unwrap().doc.layer(new).is_some());
|
|
}
|