M3.8: split the paint/panel command modules and the dialogs into per-area files

No behaviour change: every command keeps its id, label, menu, shortcut and params doc. - Engine: swatch.* -> cmd/swatch.rs, graphicStyle.* -> cmd/style.rs, appearance.* (incl. copyFrom) -> cmd/appearance.rs, stroke.set/setAdvanced -> cmd/stroke.rs, paint.editGradient/setGradientGeom -> cmd/gradient.rs. Shared helpers in cmd/mod.rs: leaf_targets/paint_targets (replacing three copies) and unique_name (swatch and graphic style naming). - UI: dialogs.rs -> dialogs/ with one file per dialog and a DialogSpec registry (one DialogKind row per dialog); shared field widgets in dialogs/form.rs. Headless frame tests draw and confirm every dialog. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 02:07:09 -06:00 · 2026-10-04 11:22:23 +07:00
parent d99853ed2a
commit b7969a6a5d
30 changed files with 2159 additions and 1546 deletions
@@ -0,0 +1,101 @@
+//! The split command modules (`cmd/{appearance,gradient,stroke,style,swatch}.rs`) and the shared
+//! helpers in `cmd/mod.rs` (`leaf_targets`, `paint_targets`, `unique_name`).
+
+use serde_json::json;
+
+use super::*;
+use crate::cmd::{leaf_targets, paint_targets, unique_name};
+
+fn session() -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
+    s
+}
+
+fn rect(s: &mut Session, x: f64) -> NodeId {
+    let r = s.execute("shape.rectangle", &json!({"x": x, "y": 10, "width": 20, "height": 20})).unwrap();
+    NodeId(r["id"].as_u64().unwrap())
+}
+
+fn id_of(v: &serde_json::Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+#[test]
+fn moved_commands_keep_their_ids() {
+    let ids = [
+        "appearance.addFill",
+        "appearance.addStroke",
+        "appearance.clear",
+        "appearance.reduceToBasic",
+        "appearance.setItem",
+        "appearance.removeItem",
+        "appearance.addEffect",
+        "appearance.duplicateItem",
+        "appearance.moveItem",
+        "appearance.copyFrom",
+        "paint.editGradient",
+        "paint.setGradientGeom",
+        "stroke.set",
+        "stroke.setAdvanced",
+        "graphicStyle.apply",
+        "graphicStyle.new",
+        "graphicStyle.delete",
+        "graphicStyle.duplicate",
+        "swatch.new",
+        "swatch.delete",
+        "swatch.newGroup",
+        "swatch.duplicate",
+        "swatch.sortByName",
+    ];
+    for id in ids {
+        assert_eq!(command_specs().iter().filter(|c| c.id == id).count(), 1, "{id}");
+    }
+}
+
+#[test]
+fn unique_name_appends_the_first_free_number() {
+    let taken = ["A", "A 2", "A 3"];
+    assert_eq!(unique_name("B", |n| taken.contains(&n)), "B");
+    assert_eq!(unique_name("A", |n| taken.contains(&n)), "A 4");
+    assert_eq!(unique_name("A 2", |n| taken.contains(&n)), "A 2 2");
+}
+
+#[test]
+fn leaf_targets_expand_groups_and_stop_at_compound_paths() {
+    let mut s = session();
+    let (a, b) = (rect(&mut s, 0.0), rect(&mut s, 30.0));
+    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+    let g = id_of(&s.execute("object.group", &json!({})).unwrap());
+    assert_eq!(leaf_targets(&s, &[g]).unwrap(), vec![a, b]);
+    let (c, d) = (rect(&mut s, 60.0), rect(&mut s, 90.0));
+    s.execute("select.set", &json!({"ids": [c.0, d.0]})).unwrap();
+    let comp = id_of(&s.execute("object.compoundPath.make", &json!({})).unwrap());
+    assert_eq!(leaf_targets(&s, &[comp]).unwrap(), vec![comp]);
+    // `paint_targets` reads `ids`, then `id`, then the selection.
+    assert_eq!(paint_targets(&s, &json!({"ids": [g.0]})).unwrap(), vec![a, b]);
+    assert_eq!(paint_targets(&s, &json!({"id": comp.0})).unwrap(), vec![comp]);
+    s.execute("select.set", &json!({"ids": [g.0, comp.0]})).unwrap();
+    assert_eq!(paint_targets(&s, &json!({})).unwrap(), vec![a, b, comp]);
+}
+
+#[test]
+fn duplicate_names_stay_unique() {
+    let mut s = session();
+    s.execute("swatch.new", &json!({"name": "Sky", "color": "#3399ff"})).unwrap();
+    assert_eq!(s.execute("swatch.duplicate", &json!({"name": "Sky"})).unwrap()["name"], "Sky copy");
+    assert_eq!(s.execute("swatch.duplicate", &json!({"name": "Sky"})).unwrap()["name"], "Sky copy 2");
+    // Colour-group names share the swatch namespace.
+    assert_eq!(s.execute("swatch.newGroup", &json!({"name": "Sky"})).unwrap()["name"], "Sky 2");
+    // New swatches from a colour are named by their RGB values (also inside new groups).
+    assert_eq!(s.execute("swatch.new", &json!({"color": "#ff8000"})).unwrap()["name"], "R=255 G=128 B=0");
+    s.execute("swatch.newGroup", &json!({"name": "G", "colors": ["#00ff00"]})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.swatch_groups.iter().find(|g| g.name == "G").unwrap().swatches[0].name, "R=0 G=255 B=0");
+
+    let id = rect(&mut s, 0.0);
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    s.execute("graphicStyle.new", &json!({"name": "Look"})).unwrap();
+    assert_eq!(s.execute("graphicStyle.duplicate", &json!({"name": "Look"})).unwrap()["name"], "Look copy");
+    assert_eq!(s.execute("graphicStyle.duplicate", &json!({"name": "Look"})).unwrap()["name"], "Look copy 2");
+}