aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-27 11:17:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Print Tiling: the origin's artboard is found with the document's own edge rule (#2637)

Browse Source
This commit is contained in:
bflatastic
2026-10-17 17:13:03 +07:00
parent d22ccebc9c
commit c18069e6ed
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/printtiling.rs
+1 -5
View File
@@ -81,11 +81,7 @@ fn point(p: &Value, key: &str) -> Option<Point> {
/// edge, else one that holds it on its right or bottom edge or within a millionth of a point
/// outside an edge (the edges `Document::art_on_artboard` counts).
fn region_holding(regions: &[(Option<usize>, Rect)], at: Point) -> Option<&(Option<usize>, Rect)> {
let holds = |r: &Rect| {
let r = r.inflate(1e-6, 1e-6);
r.x0 <= at.x && at.x <= r.x1 && r.y0 <= at.y && at.y <= r.y1
};
regions.iter().find(|(_, r)| r.contains(at)).or_else(|| regions.iter().find(|(_, r)| holds(r)))
regions.iter().find(|(_, r)| r.contains(at)).or_else(|| regions.iter().find(|(_, r)| vectorcraft_doc::artboard_holds(*r, at)))
}
fn set_origin(s: &mut Session, p: &Value) -> Result<Value> {
crates/tools/src/printtiling.rs
+1 -13
View File
@@ -27,18 +27,6 @@ fn snap1(v: f64, edges: [f64; 2], tol: f64) -> f64 {
edges.into_iter().filter(|e| (e - v).abs() <= tol).min_by(|a, b| (a - v).abs().total_cmp(&(b - v).abs())).unwrap_or(v)
}
/// Index of the first artboard holding `p`: one that holds it inside or on its left or top edge,
/// else one that holds it on its right or bottom edge or within a millionth of a point outside an
/// edge (the edges `Document::art_on_artboard` counts).
fn artboard_holding(cx: &ToolContext, p: Point) -> Option<usize> {
let rects = || cx.doc.artboards.iter().map(|a| a.rect);
let holds = |r: Rect| {
let r = r.inflate(1e-6, 1e-6);
r.x0 <= p.x && p.x <= r.x1 && r.y0 <= p.y && p.y <= r.y1
};
rects().position(|r| r.contains(p)).or_else(|| rects().position(holds))
}
impl Tool for PrintTilingTool {
fn id(&self) -> &'static str {
"printTiling"
@@ -51,7 +39,7 @@ impl Tool for PrintTilingTool {
fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
match ev.kind {
PointerKind::Down => {
let hit = artboard_holding(cx, ev.pos);
let hit = cx.doc.artboard_holding(ev.pos, false);
self.drag = Some((hit, hit.and_then(|i| cx.doc.artboards.get(i)).map(|a| a.rect)));
(self.began, self.last) = (false, ev.pos);
vec![]