DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
fix(engine): Transform values act on a selected placed graphic, not its frame
moppeeer2f21b005f3c2
diff --git a/ROADMAP.md b/ROADMAP.mdindex d33353caa..20bafb6fa 100644--- a/ROADMAP.md+++ b/ROADMAP.md@@ -129,6 +129,7 @@ list) · [roadmap.md](docs/roadmap.md) (milestones, plan) · [parity-checklist.mNewest first.+- **2026-10-12** · With a placed graphic selected (Direct Selection), the Transform values act on the graphic inside its frame, as in InDesign: a tilted frame's image can be straightened to 0°. No readiness percentage change.- **2026-10-12** · Words in capitals hyphenate like capitalized words (FERRUM COM-MODI), as in InDesign; Hyphenate Capitalized Words off keeps them whole. No readiness percentage change.- **2026-10-11** · `transform.move {copy}`, Edit › Duplicate and Step and Repeat return the copies' ids, so a script can go on with them. No readiness percentage change.- **2026-10-11** · `object.fill` and `object.stroke` refuse a swatch name the document doesn't have (it painted nothing) and suggest the name meant (`Paper` → `[Paper]`). No readiness percentage change.diff --git a/crates/engine/src/cmd/object.rs b/crates/engine/src/cmd/object.rsindex cd13be117..28da3bc8e 100644--- a/crates/engine/src/cmd/object.rs+++ b/crates/engine/src/cmd/object.rs@@ -134,7 +134,7 @@ pub fn specs() -> Vec<CommandSpec> {"Transform Panel",[],None,- "{x?, y?, width?, height?, scaleX? (%), scaleY? (%), rotation? (°), shear? (°), ref?: 0..8, ids?} — reference-point based geometry; rotation and shear are absolute (Transformations are Totals decides whether nested objects measure them on the pasteboard)",+ "{x?, y?, width?, height?, scaleX? (%), scaleY? (%), rotation? (°), shear? (°), ref?: 0..8, ids?, content?: bool (the placed graphic inside each frame; the frame stays. Default: whether the selection is content, when no ids are given)} — reference-point based geometry; rotation and shear are absolute (Transformations are Totals decides whether nested objects measure them on the pasteboard)",has_selection,transform_set),@@ -1250,6 +1250,11 @@ fn transform_values(s: &mut Session, p: &Value, ids: &[ItemId], rf: usize) -> Refn transform_set(s: &mut Session, p: &Value) -> Result<Value> {let ids = targets(s, p)?;+ // Direct Selection of a placed graphic (or `content`): the graphic moves inside its frame.+ let content = p.get("content").and_then(Value::as_bool).unwrap_or(p.get("ids").is_none() && s.doc()?.selection.content);+ if content {+ return transform_content(s, p, &ids);+ }if ["rotation", "shear", "scaleX", "scaleY"].iter().any(|k| p.get(*k).is_some()) {let rf = p.get("ref").and_then(Value::as_u64).unwrap_or(4) as usize;if !["x", "y", "width", "height"].iter().any(|k| p.get(*k).is_some()) {@@ -1314,6 +1319,84 @@ fn transform_set(s: &mut Session, p: &Value) -> Result<Value> {})}+/// `transform.set` on the placed graphics of `ids` (the frames stay): rotation, shear and scale are+/// absolute, measured as `transform.info` reports the content (on the pasteboard with+/// Transformations are Totals, else in the frame); x, y, width and height are the graphic's bounds+/// on the page, about the reference point. Frames without a placed graphic are left alone.+fn transform_content(s: &mut Session, p: &Value, ids: &[ItemId]) -> Result<Value> {+ let totals = s.prefs.transformations_are_totals;+ let get = |k: &str| p.get(k).and_then(Value::as_f64).filter(|v| v.is_finite());+ let (rot, shear, sx, sy) = (get("rotation"), get("shear").map(|v| v.clamp(-85.0, 85.0)), get("scaleX"), get("scaleY"));+ let (x, y, w, h) = (get("x"), get("y"), get("width").map(|v| v.max(0.01)), get("height").map(|v| v.max(0.01)));+ if [sx, sy].iter().flatten().any(|v| v.abs() < 0.01) {+ return Err(bad("transform.set", "scale too small"));+ }+ let rf = p.get("ref").and_then(Value::as_u64).unwrap_or(4).min(8) as usize;+ {+ let d = &s.doc()?.doc;+ if !ids.iter().any(|i| d.item(*i).is_some_and(|it| it.graphic().is_some())) {+ return Err(bad("transform.set", "no placed graphic to transform"));+ }+ }+ s.edit(|d, _| {+ let mut changed = 0;+ for id in ids {+ let Some(loc) = d.find(*id) else { continue };+ let full = d.parent_xf(&loc);+ let Some(it) = d.item(*id) else { continue };+ if it.locked {+ continue;+ }+ let Some(g) = it.graphic() else { continue };+ let frame = full * it.xf;+ let rect = Rect::new(0.0, 0.0, g.size.0.max(1e-9), g.size.1.max(1e-9));+ // Rotation, shear and scale in the measuring space (pasteboard or frame).+ let q = if totals { frame } else { Affine::IDENTITY };+ let mut cur = q * g.xf;+ let lin = |m: Affine| {+ let c = m.as_coeffs();+ Affine::new([c[0], c[1], c[2], c[3], 0.0, 0.0])+ };+ if rot.is_some() || shear.is_some() || sx.is_some() || sy.is_some() {+ let a = designcraft_geom::reference_point(cur.transform_rect_bbox(rect), rf).to_vec2();+ let v = designcraft_geom::decompose::decompose(cur);+ let mut t = v;+ if let Some(r) = rot {+ t.rotation = r;+ }+ if let Some(k) = shear {+ t.shear = k;+ }+ if let Some(x) = sx {+ t.scale_x = x / 100.0;+ }+ if let Some(y) = sy {+ t.scale_y = y / 100.0;+ }+ let delta = designcraft_geom::decompose::compose(&t) * lin(cur).inverse();+ cur = Affine::translate(a) * delta * Affine::translate(-a) * cur;+ }+ let mut gx = q.inverse() * cur;+ // Position and size: the graphic's bounds on the page.+ if x.is_some() || y.is_some() || w.is_some() || h.is_some() {+ let b = (frame * gx).transform_rect_bbox(rect);+ let a = designcraft_geom::reference_point(b, rf);+ let (fx, fy) = (w.map_or(1.0, |w| w / b.width().max(1e-9)), h.map_or(1.0, |h| h / b.height().max(1e-9)));+ let page_x =+ d.spread(loc.spread).and_then(|sp| sp.page_at_x(b.center().x).and_then(|pi| sp.pages.get(pi)).map(|pg| pg.x)).unwrap_or(0.0);+ let to = Point::new(x.map_or(a.x, |x| x + page_x), y.map_or(a.y, |y| y));+ let m = Affine::translate(to.to_vec2()) * Affine::scale_non_uniform(fx, fy) * Affine::translate(-a.to_vec2());+ gx = frame.inverse() * m * frame * gx;+ }+ if let Some(Content::Graphic(g)) = d.item_mut(*id).map(|it| &mut it.content) {+ g.xf = gx;+ changed += 1;+ }+ }+ Ok(json!({ "changed": changed }))+ })+}+fn arrange(s: &mut Session, p: &Value) -> Result<Value> {let ids = targets(s, p)?;let to = str_param(p, "to").unwrap_or("front").to_string();@@ -2813,3 +2896,55 @@ mod swatch_name_tests {}}}++#[cfg(test)]+mod content_transform_tests {+ use serde_json::json;++ use crate::Session;++ /// A rotated graphic frame holding a 200 x 100 image, its content selected.+ fn rotated_frame_with_image() -> (Session, u64) {+ let mut s = Session::new();+ s.execute("file.new", &json!({})).unwrap();+ let f = s.execute("frame.create", &json!({"rect": [100, 100, 300, 300], "content": "graphic"})).unwrap()["id"].as_u64().unwrap();+ let png = designcraft_render::Rendered { width: 200, height: 100, pixels: vec![200u8; 200 * 100 * 4] }.to_png();+ s.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&png), "name": "a.png", "frame": f})).unwrap();+ s.execute("transform.rotate", &json!({"ids": [f], "angle": -45})).unwrap();+ s.execute("selection.set", &json!({"ids": [f], "content": true})).unwrap();+ (s, f)+ }++ #[test]+ fn rotating_the_content_leaves_the_frame_as_it_is() {+ let (mut s, f) = rotated_frame_with_image();+ let before = s.execute("transform.info", &json!({"ids": [f]})).unwrap();+ assert!((before["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6 && (before["content"]["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6);+ // The tutorial's step: the image straightened inside its tilted frame.+ s.execute("transform.set", &json!({"rotation": 0})).unwrap();+ let after = s.execute("transform.info", &json!({"ids": [f]})).unwrap();+ assert!((after["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6, "the frame stays at -45: {after}");+ assert!(after["content"]["rotation"].as_f64().unwrap().abs() < 1e-6, "the image is upright: {after}");+ // Scale and position act on the image too.+ s.execute("transform.set", &json!({"scaleX": 50, "scaleY": 50})).unwrap();+ let info = s.execute("transform.info", &json!({"ids": [f]})).unwrap();+ assert!((info["content"]["scaleX"].as_f64().unwrap() - 50.0).abs() < 1e-6, "{info}");+ assert!((info["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6);+ // One undo step each.+ s.execute("edit.undo", &json!({})).unwrap();+ s.execute("edit.undo", &json!({})).unwrap();+ let undone = s.execute("transform.info", &json!({"ids": [f]})).unwrap();+ assert!((undone["content"]["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6, "{undone}");+ }++ #[test]+ fn a_frame_selection_still_transforms_the_frame_and_an_empty_frame_has_no_content() {+ let (mut s, f) = rotated_frame_with_image();+ // `content: false` (or a frame selection) turns frame and image together.+ s.execute("transform.set", &json!({"rotation": 0, "content": false})).unwrap();+ let info = s.execute("transform.info", &json!({"ids": [f]})).unwrap();+ assert!(info["rotation"].as_f64().unwrap().abs() < 1e-6, "{info}");+ let e = s.execute("frame.create", &json!({"rect": [400, 100, 500, 200], "content": "graphic"})).unwrap()["id"].as_u64().unwrap();+ assert!(s.execute("transform.set", &json!({"ids": [e], "content": true, "rotation": 10})).is_err());+ }+}