aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-02 14:47:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Integration: a selected graphic's Transform x/y are measured from the rulers' zero point

Browse Source 
#550 places a selected graphic at x/y from its page's left edge; next measures
transform.set x/y from the rulers' zero point (view.zeroPoint, ruler origin), and the
Transform fields show a graphic's bounds from that point. transform_content now targets
x/y from the same origin as the frame path, so a typed value lands where the fields
say it is.
This commit is contained in:
aiongg
2026-10-12 12:32:01 +00:00
parent 4dbd73a6fd
commit 91a2155cdd
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/object.rs
+27 -3
View File
@@ -1471,9 +1471,9 @@ fn transform_content(s: &mut Session, p: &Value, ids: &[ItemId]) -> Result<Value
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));
// x/y are measured from the rulers' zero point, as for a frame.
let o = d.ruler_origin(loc.spread, b.center().x).unwrap_or(Point::ORIGIN);
let to = Point::new(x.map_or(a.x, |x| x + o.x), y.map_or(a.y, |y| y + o.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;
}
@@ -3759,6 +3759,30 @@ mod content_transform_tests {
assert!((by_id["rotation"].as_f64().unwrap() + 45.0).abs() < 1e-6, "{by_id}");
}
#[test]
fn the_graphic_moves_to_x_and_y_from_the_rulers_zero_point() {
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("view.zeroPoint", &json!({"at": [72, 36]})).unwrap();
s.execute("selection.set", &json!({"ids": [f], "content": true})).unwrap();
s.execute("transform.set", &json!({"x": 10, "y": 20, "ref": 0})).unwrap();
// The graphic's top-left, measured from the zero point (what the Transform fields show).
let d = &s.doc().unwrap().doc;
let id = designcraft_doc::ItemId(f);
let loc = d.find(id).unwrap();
let it = d.item(id).unwrap();
let g = it.graphic().unwrap();
let b = (d.parent_xf(&loc) * it.xf * g.xf).transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1));
let o = d.ruler_origin(loc.spread, b.center().x).unwrap();
assert!(o.x > 0.0 && o.y > 0.0, "the zero point moved: {o:?}");
assert!((b.x0 - o.x - 10.0).abs() < 1e-6 && (b.y0 - o.y - 20.0).abs() < 1e-6, "{b:?} from {o:?}");
// The frame stays.
assert!((it.bounds().x0 - 100.0).abs() < 1e-6, "{:?}", it.bounds());
}
#[test]
fn a_locked_frame_records_no_undo_step() {
let (mut s, f) = rotated_frame_with_image();