mirror of
https://github.com/storytold/figcraft.git
synced 2026-11-18 08:07:26 +00:00
Measured in Figma: in vector edit mode Copy takes only the selected segments (a lone point, the segments touching it) and a paste outside makes a new vector in place; Cut removes them, splitting the path in the same layer and staying in edit mode; Paste while editing adds the clipboard's segments or a copied layer's outline to the vector's network in place, selecting them. FigCraft copied the whole layer, Cut left nothing to paste, and Paste while editing did nothing. 16 new engine and UI tests cover copy, cut, paste, undo and junk parameters; the whole engine suite passes bar the known font test. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Model-Effort: Opus 5.5 drove; Opus 5.5 briefed; Sonnet 5.5 wrote at high
98 lines
4.8 KiB
Rust
98 lines
4.8 KiB
Rust
//! Keys in vector edit mode that the window's key handling twists: Windows sends Shift+Delete
|
|
//! (delete the points and heal the path) as a cut command and no key at all, so the canvas must
|
|
//! heal the selected points rather than cut the layer.
|
|
|
|
use egui::{Event, Modifiers};
|
|
use figcraft_doc::NodeId;
|
|
use figcraft_engine::Session;
|
|
use serde_json::json;
|
|
|
|
use crate::layers_drag_tests::Ui;
|
|
|
|
fn id(v: serde_json::Value) -> NodeId {
|
|
NodeId(v["id"].as_u64().unwrap())
|
|
}
|
|
|
|
fn net(u: &Ui, path: NodeId) -> figcraft_doc::VectorNetwork {
|
|
let doc = u.app.session.doc().unwrap();
|
|
figcraft_engine::vectoredit::network(doc, path).unwrap().clone()
|
|
}
|
|
|
|
/// A three-point open path A-B-C in edit mode, B selected.
|
|
fn abc(u: &mut Ui) -> NodeId {
|
|
let path = id(u.app.session.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
|
|
u.app.session.execute("vector.edit.begin", &json!({"id": path})).unwrap();
|
|
u.app.session.execute("vector.edit.select", &json!({"vertices": [1]})).unwrap();
|
|
path
|
|
}
|
|
|
|
#[test]
|
|
fn shift_delete_in_vector_edit_mode_heals_the_point_instead_of_cutting_the_layer() {
|
|
let mut u = Ui::new(Session::new());
|
|
let path = abc(&mut u);
|
|
// Windows: egui-winit turns Shift+Delete into a cut command, with no key event.
|
|
u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
|
|
assert!(u.app.session.doc().unwrap().node(path).is_some(), "the layer stays");
|
|
let n = net(&u, path);
|
|
assert_eq!(n.vertices.len(), 2, "the point is gone: {n:?}");
|
|
assert_eq!(n.segments.len(), 1, "A and C are joined");
|
|
let (a, b) = (n.vertices.first().map(|v| v.x).unwrap_or_default(), n.vertices.get(1).map(|v| v.x).unwrap_or_default());
|
|
assert!(b - a == 200.0 && n.vertices.iter().all(|v| v.y == 0.0), "it runs straight from A to C: {n:?}");
|
|
}
|
|
|
|
#[test]
|
|
fn a_cut_command_in_edit_mode_takes_the_selected_points_not_the_layer() {
|
|
let mut u = Ui::new(Session::new());
|
|
let path = abc(&mut u);
|
|
u.frame_with(vec![Event::Cut], Modifiers::COMMAND);
|
|
assert!(u.app.session.doc().unwrap().node(path).is_some(), "Ctrl+X on points keeps the layer");
|
|
assert_eq!(net(&u, path).vertices.len(), 2, "it takes the selected point");
|
|
}
|
|
|
|
#[test]
|
|
fn ctrl_x_on_selected_segments_puts_them_on_the_clipboard_and_keeps_the_layer() {
|
|
let mut u = Ui::new(Session::new());
|
|
let path = abc(&mut u);
|
|
u.app.session.execute("vector.edit.select", &json!({"segments": [0]})).unwrap();
|
|
u.frame_with(vec![Event::Cut], Modifiers::COMMAND);
|
|
assert!(u.app.session.doc().unwrap().node(path).is_some(), "Ctrl+X keeps the layer");
|
|
assert_eq!(net(&u, path).segments.len(), 1, "the segment is gone");
|
|
assert_eq!(u.app.session.clipboard.nodes.len(), 1, "and on the clipboard");
|
|
assert!(u.app.session.ds().unwrap().vector_edit.is_some(), "edit mode stays on");
|
|
}
|
|
|
|
#[test]
|
|
fn a_cut_command_in_edit_mode_with_nothing_selected_keeps_the_layer() {
|
|
let mut u = Ui::new(Session::new());
|
|
let path = abc(&mut u);
|
|
u.app.session.execute("vector.edit.select", &json!({"vertices": []})).unwrap();
|
|
u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
|
|
assert!(u.app.session.doc().unwrap().node(path).is_some(), "nothing selected: nothing goes");
|
|
assert_eq!(net(&u, path).vertices.len(), 3);
|
|
}
|
|
|
|
#[test]
|
|
fn a_cut_command_heals_points_selected_in_another_edited_layer() {
|
|
let mut u = Ui::new(Session::new());
|
|
let a = id(u.app.session.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
|
|
let b = id(u.app.session.execute("vector.create", &json!({"points": [[100, 200], [200, 200], [300, 200]], "closed": false})).unwrap());
|
|
figcraft_engine::vectoredit::begin_many(&mut u.app.session, &[a, b]).unwrap();
|
|
// Points selected in the second layer, then the first made active: only `others` has a selection.
|
|
u.app.session.execute("vector.edit.select", &json!({"id": b, "vertices": [1]})).unwrap();
|
|
u.app.session.execute("vector.edit.select", &json!({"id": a, "add": true})).unwrap();
|
|
u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
|
|
assert!(u.app.session.doc().unwrap().node(a).is_some() && u.app.session.doc().unwrap().node(b).is_some(), "both layers stay");
|
|
assert_eq!(net(&u, a).vertices.len(), 3, "the active layer had nothing selected");
|
|
assert_eq!(net(&u, b).vertices.len(), 2, "the other layer's point is gone");
|
|
}
|
|
|
|
#[test]
|
|
fn a_cut_command_outside_edit_mode_cuts_the_layer() {
|
|
let mut s = Session::new();
|
|
let path = id(s.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
|
|
s.execute("select.set", &json!({"ids": [path]})).unwrap();
|
|
let mut u = Ui::new(s);
|
|
u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
|
|
assert!(u.app.session.doc().unwrap().node(path).is_none(), "outside edit mode the selected layer is cut");
|
|
}
|