Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  bflatasticandClaude Opus 5.5
|
f7c88af1de | ||
|
BFlat
|
70b1bbf679 |
No files matched your search
+2
-2
@@ -4,7 +4,7 @@ VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adob
|
||||
|
||||
This file tracks **how far we are and what's left**. Time estimates are wall-clock hours of continuous Claude Opus 5.5 agent work (including builds and the CI gate), given both for **one agent** and for **4–6 parallel agents** on disjoint crates. They are counted from the remaining work (see [Parity estimate](#parity-estimate)), calibrated against measured throughput, and updated as work lands.
|
||||
|
||||
_Last updated: 2026-10-08 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS files from Illustrator 2026, Inkscape/cairo, matplotlib, CorelDRAW, Affinity, LibreOffice and Ghostscript opening as vectors, and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491); see [Honest assessment](#honest-assessment-2026-10-05))._
|
||||
_Last updated: 2026-10-08 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS files from Illustrator 2026, Inkscape/cairo, matplotlib, CorelDRAW, Affinity, LibreOffice and Ghostscript opening as vectors, and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482); see [Honest assessment](#honest-assessment-2026-10-05))._
|
||||
|
||||
## Where we are
|
||||
|
||||
@@ -128,7 +128,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
|
||||
- **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, onto the Swatches panel a pattern swatch and onto the Brushes panel an Art brush; a symbol dragged onto the canvas places an instance where it is dropped, and a brush dragged onto a path is applied to it.
|
||||
- **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, the Selection, Direct Selection and Group Selection tools the Move dialog (Enter opens these seven tools' dialogs too), Gradient, Eyedropper, Blend and the Liquify tools their panels or options, and the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, the tolerances, the brush size).
|
||||
- **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, Alt-click an eye or lock to hide or lock the other layers (again: show or unlock them all), triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies) and a dimmed copy of the row under the pointer (dropped on the trash rows are deleted, on New Layer duplicated, as in Illustrator), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets, each with a chip of its colour, or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
|
||||
- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles: the dragged edges align with the other objects; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
|
||||
- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles with the Selection or Free Transform tool, Shift and Alt too: the dragged corner or side lands on the other objects' anchors and centres ("anchor", "center") or lines up with their edges and centres (a line and "align"); the Rotate, Scale, Shear and Reflect tools drag from the anchor they grab and snap the pointer the same way, so a corner dragged onto another object's anchor scales exactly onto it, #482; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
|
||||
- **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard and fits it, and Fit Artboard in Window and Actual Size show the navigator's artboard. The Artboards panel highlights that active artboard: clicking a row makes it active (the Artboard tool's too, while it is chosen) as does clicking an artboard with the Artboard tool, double-clicking its number also fits it in the window and double-clicking its name renames it. Duplicate Artboards, or a row dragged onto New Artboard, copies the artboard with its art (#446). Escape leaves Presentation Mode, F from it goes back to Normal Screen Mode, and the screen mode isn't saved with the preferences: the app always starts in Normal Screen Mode with its menus and panels (#472).
|
||||
- **Geometry and effects:**
|
||||
- Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
|
||||
|
||||
+86
-25
@@ -271,8 +271,8 @@ impl Targets {
|
||||
/// Snap a single point: onto the nearest anchor or centre, else onto the nearest segment, else
|
||||
/// into line with targets. Returns the snapped point and guide overlays.
|
||||
pub fn snap_point(&self, p: Point, tol: f64) -> (Point, Vec<Overlay>) {
|
||||
if let Some((q, k)) = self.points.iter().filter(|(q, _)| q.distance(p) <= tol).min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p))) {
|
||||
return (*q, self.label(*q, k.label()).into_iter().collect());
|
||||
if let Some((q, k)) = self.nearest_point(p, tol) {
|
||||
return (q, self.label(q, k.label()).into_iter().collect());
|
||||
}
|
||||
if let Some(q) = self.on_segment(p, tol) {
|
||||
return (q, self.label(q, Kind::Edge.label()).into_iter().collect());
|
||||
@@ -302,6 +302,11 @@ impl Targets {
|
||||
(out, ov)
|
||||
}
|
||||
|
||||
/// The anchor or centre nearest `p`, within `tol`.
|
||||
fn nearest_point(&self, p: Point, tol: f64) -> Option<(Point, Kind)> {
|
||||
self.points.iter().copied().filter(|(q, _)| q.distance(p) <= tol).min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p)))
|
||||
}
|
||||
|
||||
/// The nearest point within `tol` of `p` on a target segment.
|
||||
fn on_segment(&self, p: Point, tol: f64) -> Option<Point> {
|
||||
self.segments
|
||||
@@ -334,7 +339,7 @@ impl Targets {
|
||||
/// bleed edge beyond it): onto an anchor or centre near the point itself, otherwise into line
|
||||
/// with targets, each axis on whichever of them comes nearest.
|
||||
pub fn snap_point_with(&self, p: Point, offsets: &[Vec2], tol: f64) -> (Point, Vec<Overlay>) {
|
||||
if self.points.iter().any(|(q, _)| q.distance(p) <= tol) {
|
||||
if self.nearest_point(p, tol).is_some() {
|
||||
return self.snap_point(p, tol);
|
||||
}
|
||||
let rects: Vec<Rect> = std::iter::once(Vec2::ZERO).chain(offsets.iter().copied()).map(|o| Rect::from_points(p + o, p + o)).collect();
|
||||
@@ -390,11 +395,14 @@ impl Targets {
|
||||
|
||||
/// Snap a bounding-box resize. `a` is the scale [`crate::bbox::scale_for_drag`] gave for
|
||||
/// dragging `handle` of the box `bx` (about the centre when `from_center`), in the box's own
|
||||
/// frame, and so is the result. The corners and the side that handle moves land on the nearest
|
||||
/// target within `tol` on the page, whatever the box's angle. A handle with one way to go (a
|
||||
/// side, or a proportional corner) slides along it until one of them is on a target.
|
||||
/// frame, and so is the result. The handle lands on an anchor or centre within `tol` on the page
|
||||
/// (labelled as [`Self::snap_point`] does), else the corners and the side it moves line up with
|
||||
/// the nearest target ("align"), whatever the box's angle. A handle with one way to go (a side,
|
||||
/// or a proportional corner) slides along it until one of them is on a target.
|
||||
pub fn snap_scale(&self, bx: &OrientedBox, handle: Handle, a: Affine, proportional: bool, from_center: bool, tol: f64) -> (Affine, Vec<Overlay>) {
|
||||
type Hit = Option<(f64, Point)>;
|
||||
// Where a snap lands: in line with a target's x and/or y, or on an anchor or centre.
|
||||
type Snap = (Hit, Hit, Option<(Point, Kind)>);
|
||||
let r = bx.rect;
|
||||
let origin = if from_center { r.center() } else { handle.opposite().pos(r) };
|
||||
let (d0, [sx, _, _, sy, _, _]) = (handle.pos(r) - origin, a.as_coeffs());
|
||||
@@ -405,12 +413,14 @@ impl Targets {
|
||||
ts.iter().map(|(t, from, _)| (*t, *from)).filter(|(t, _)| (t - v).abs() <= tol).min_by(|p, q| (p.0 - v).abs().total_cmp(&(q.0 - v).abs()))
|
||||
};
|
||||
let (mut nx, mut ny) = (sx, sy);
|
||||
let (mut hit_x, mut hit_y): (Hit, Hit) = (None, None);
|
||||
let mut snap: Snap = (None, None, None);
|
||||
if handle.is_corner() && !proportional {
|
||||
// The corner goes anywhere: it takes the target's x, its y, or both.
|
||||
// The corner goes anywhere: onto an anchor or centre, else it takes the target's x, its
|
||||
// y, or both.
|
||||
let p = to_doc * (a * handle.pos(r));
|
||||
let (hx, hy) = (nearest(p.x, &self.xs), nearest(p.y, &self.ys));
|
||||
for (tx, ty) in [(hx, hy), (hx, None), (None, hy)] {
|
||||
let on = self.nearest_point(p, tol).map(|(q, k)| (Some((q.x, q)), Some((q.y, q)), Some((q, k))));
|
||||
for (tx, ty, at) in on.into_iter().chain([(hx, hy, None), (hx, None, None), (None, hy, None)]) {
|
||||
if tx.is_none() && ty.is_none() {
|
||||
continue;
|
||||
}
|
||||
@@ -421,7 +431,7 @@ impl Targets {
|
||||
(cx, cy) = (if tx.is_some() { cx } else { sx }, if ty.is_some() { cy } else { sy });
|
||||
}
|
||||
if valid(cx, sx) && valid(cy, sy) {
|
||||
(nx, ny, hit_x, hit_y) = (cx, cy, tx, ty);
|
||||
(nx, ny, snap) = (cx, cy, (tx, ty, at));
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -441,34 +451,44 @@ impl Targets {
|
||||
// How far the handle travels per unit of `s`: a snap may not drag it far from the
|
||||
// pointer, as it would for a target the side runs almost along.
|
||||
let travel = (e.0 * d0.x).hypot(e.1 * d0.y);
|
||||
let mut best: Option<(f64, f64, bool, (f64, Point))> = None;
|
||||
// The snap so far: its `s`, whether it only lines up (an anchor or centre comes first),
|
||||
// how far it moves the handle, and where it lands.
|
||||
let mut best: Option<(f64, bool, f64, Snap)> = None;
|
||||
let mut consider = |s: f64, in_line: bool, found: Snap| {
|
||||
let moved = (s - s0).abs() * travel;
|
||||
if valid(s, s0) && moved <= 2.0 * tol && best.as_ref().is_none_or(|k| (in_line, moved) < (k.1, k.2)) {
|
||||
best = Some((s, in_line, moved, found));
|
||||
}
|
||||
};
|
||||
for h in std::iter::once(handle).chain(ends.into_iter().flatten().copied()) {
|
||||
let v = h.pos(r) - origin;
|
||||
let base = to_doc * (origin + Vec2::new(c.0 * v.x, c.1 * v.y));
|
||||
let dir = (to_doc * Point::new(e.0 * v.x, e.1 * v.y)).to_vec2();
|
||||
let p = base + dir * s0;
|
||||
// An anchor or centre beside its way: it stops at the nearest point of the way.
|
||||
let l2 = dir.hypot2();
|
||||
if l2 > 1e-18
|
||||
&& let Some((q, k)) = self.nearest_point(p, tol)
|
||||
{
|
||||
consider((q - base).dot(dir) / l2, false, (None, None, Some((q, k))));
|
||||
}
|
||||
for (is_x, at, b, d, ts) in [(true, p.x, base.x, dir.x, &self.xs), (false, p.y, base.y, dir.y, &self.ys)] {
|
||||
if d.abs() <= 1e-9 {
|
||||
continue;
|
||||
}
|
||||
let Some(hit) = nearest(at, ts) else { continue };
|
||||
let s = (hit.0 - b) / d;
|
||||
let moved = (s - s0).abs() * travel;
|
||||
if valid(s, s0) && moved <= 2.0 * tol && best.is_none_or(|k| moved < k.1) {
|
||||
best = Some((s, moved, is_x, hit));
|
||||
}
|
||||
consider((hit.0 - b) / d, true, if is_x { (Some(hit), None, None) } else { (None, Some(hit), None) });
|
||||
}
|
||||
}
|
||||
if let Some((s, _, is_x, hit)) = best {
|
||||
(nx, ny) = (c.0 + s * e.0, c.1 + s * e.1);
|
||||
if is_x {
|
||||
hit_x = Some(hit);
|
||||
} else {
|
||||
hit_y = Some(hit);
|
||||
}
|
||||
if let Some((s, _, _, found)) = best {
|
||||
(nx, ny, snap) = (c.0 + s * e.0, c.1 + s * e.1, found);
|
||||
}
|
||||
}
|
||||
let out = Affine::translate(origin.to_vec2()) * Affine::scale_non_uniform(nx, ny) * Affine::translate(-origin.to_vec2());
|
||||
let (hit_x, hit_y, on) = snap;
|
||||
if let Some((q, k)) = on {
|
||||
return (out, self.label(q, k.label()).into_iter().collect());
|
||||
}
|
||||
// The lines run from the target's own point across the resized box, on the page.
|
||||
let nr = (to_doc * out).transform_rect_bbox(r);
|
||||
let mut ov = vec![];
|
||||
@@ -478,6 +498,9 @@ impl Targets {
|
||||
if let Some((y, from)) = hit_y {
|
||||
ov.extend(self.line(Point::new(from.x.min(nr.x0), y), Point::new(from.x.max(nr.x1), y)));
|
||||
}
|
||||
if hit_x.is_some() || hit_y.is_some() {
|
||||
ov.extend(self.label(to_doc * (out * handle.pos(r)), "align"));
|
||||
}
|
||||
(out, ov)
|
||||
}
|
||||
}
|
||||
@@ -612,13 +635,16 @@ mod tests {
|
||||
(a.transform_rect_bbox(r), ov)
|
||||
};
|
||||
// The bottom edge lands on the neighbour's bottom: same height.
|
||||
let lines = |ov: &[Overlay]| ov.iter().filter(|o| matches!(o, Overlay::Line { .. })).count();
|
||||
let align = |ov: &[Overlay]| ov.iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "align"));
|
||||
let (nr, ov) = snap(Handle::Bottom, Point::new(275.0, 197.0), false, false);
|
||||
assert_eq!(nr, Rect::new(250.0, 100.0, 300.0, 200.0));
|
||||
assert_eq!(ov.len(), 1);
|
||||
assert_eq!(lines(&ov), 1);
|
||||
assert!(align(&ov), "{ov:?}");
|
||||
// A corner snaps each axis on its own: y to the neighbour, x stays free.
|
||||
let (nr, ov) = snap(Handle::BottomRight, Point::new(330.0, 202.0), false, false);
|
||||
assert_eq!(nr, Rect::new(250.0, 100.0, 330.0, 200.0));
|
||||
assert_eq!(ov.len(), 1);
|
||||
assert_eq!(lines(&ov), 1);
|
||||
// Proportional: the snapped axis carries the other one.
|
||||
let (nr, _) = snap(Handle::BottomRight, Point::new(340.0, 198.0), true, false);
|
||||
assert_eq!(nr, Rect::new(250.0, 100.0, 350.0, 200.0));
|
||||
@@ -634,6 +660,41 @@ mod tests {
|
||||
assert!(ov.is_empty());
|
||||
}
|
||||
|
||||
/// A resize handle lands on another object's anchor point (#482), not only in line with its
|
||||
/// edges and centre, and says so; a side handle stops where its way passes the anchor.
|
||||
#[test]
|
||||
fn scale_snap_lands_the_handle_on_anchors() {
|
||||
use crate::bbox::scale_for_drag;
|
||||
use vectorcraft_doc::{Appearance, Node};
|
||||
let (mut d, _) = doc_with_rect();
|
||||
let l = d.layers[0].id;
|
||||
let id = d.alloc_id();
|
||||
// A triangle whose apex (320, 400) lines up with none of the edges or centres on x.
|
||||
let tri = vectorcraft_geom::PathData::single(SubPath::polyline(
|
||||
&[Point::new(300.0, 300.0), Point::new(380.0, 300.0), Point::new(320.0, 400.0)],
|
||||
true,
|
||||
));
|
||||
d.insert(Some(l), 1, Node::path(id, tri, Appearance::default_art())).unwrap();
|
||||
let t = Targets::collect(&d, &[], None);
|
||||
let snap = |r: Rect, h: Handle, p: Point, shift: bool| {
|
||||
let (a, ov) = t.snap_scale(&OrientedBox::aligned(r), h, scale_for_drag(r, h, p, shift, false), shift, false, 4.0);
|
||||
(a.transform_rect_bbox(r), ov)
|
||||
};
|
||||
let anchor = |ov: &[Overlay]| matches!(ov, [Overlay::Label { text, p, .. }] if text == "anchor" && *p == Point::new(320.0, 400.0));
|
||||
// A free corner takes the anchor's x and y.
|
||||
let (nr, ov) = snap(Rect::new(250.0, 350.0, 300.0, 390.0), Handle::BottomRight, Point::new(322.0, 398.0), false);
|
||||
assert_eq!(nr, Rect::new(250.0, 350.0, 320.0, 400.0));
|
||||
assert!(anchor(&ov), "{ov:?}");
|
||||
// The right side, at the apex's height: its x lands on the anchor.
|
||||
let (nr, ov) = snap(Rect::new(250.0, 380.0, 300.0, 420.0), Handle::Right, Point::new(318.0, 401.0), false);
|
||||
assert_eq!(nr, Rect::new(250.0, 380.0, 320.0, 420.0));
|
||||
assert!(anchor(&ov), "{ov:?}");
|
||||
// A proportional corner slides along its diagonal onto it.
|
||||
let (nr, ov) = snap(Rect::new(240.0, 320.0, 300.0, 380.0), Handle::BottomRight, Point::new(318.0, 398.0), true);
|
||||
assert_eq!(nr, Rect::new(240.0, 320.0, 320.0, 400.0));
|
||||
assert!(anchor(&ov), "{ov:?}");
|
||||
}
|
||||
|
||||
/// Preferences › Smart Guides › Display Options (#394): the colour, and Alignment Guides and
|
||||
/// Anchor/Path Labels off, change what shows and never where a point lands.
|
||||
#[test]
|
||||
|
||||
@@ -5,7 +5,10 @@
|
||||
//! at release makes a copy: Alt-drag). Alt-click (the release of a click made with Alt) sets the
|
||||
//! point and opens the tool's dialog; double-click or Return opens the dialog too. A clicked or
|
||||
//! Alt-clicked point snaps to the nearest anchor or centre (Snap to Point / Smart Guides), labelled
|
||||
//! while hovering, so transforms pivot exactly on a corner.
|
||||
//! while hovering, so transforms pivot exactly on a corner. A drag starts from the point it grabbed
|
||||
//! snapped the same way, and the pointer snaps as a drawn point does (Smart Guides: the other
|
||||
//! objects' anchors, centres and edges; or the grid, pixels, Snap to Point), so a corner dragged
|
||||
//! onto another object's anchor scales exactly onto it.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::NodeId;
|
||||
@@ -13,7 +16,7 @@ use vectorcraft_geom::{Affine, Point, Rect, Vec2};
|
||||
|
||||
use super::target_overlays;
|
||||
use crate::bbox::rotate_for_drag;
|
||||
use crate::guides::snap_pick;
|
||||
use crate::guides::{PointSnap, Targets, snap_pick};
|
||||
use crate::select::{matrix_json, selection_bounds, selection_box};
|
||||
use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
|
||||
|
||||
@@ -57,7 +60,8 @@ impl TransformKind {
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
struct Drag {
|
||||
start: Point,
|
||||
/// The pressed point snapped to an anchor or centre (becomes the reference point on a click).
|
||||
/// The pressed point snapped to an anchor or centre: the reference point on a click, where a
|
||||
/// drag starts from.
|
||||
pick: Point,
|
||||
origin: Point,
|
||||
began: bool,
|
||||
@@ -73,8 +77,10 @@ pub struct TransformTool {
|
||||
origin: Option<(Point, Vec<NodeId>)>,
|
||||
drag: Option<Drag>,
|
||||
measure: Option<(Point, String)>,
|
||||
/// Snap feedback while hovering ("anchor" / "center" label).
|
||||
/// Snap feedback while hovering ("anchor" / "center" label), and for the dragged pointer.
|
||||
hover: Vec<Overlay>,
|
||||
/// What the dragged pointer snaps to, gathered when the drag begins.
|
||||
snap: Option<PointSnap>,
|
||||
}
|
||||
|
||||
fn about(o: Point, a: Affine) -> Affine {
|
||||
@@ -88,7 +94,7 @@ pub fn reflect_matrix(o: Point, theta: f64) -> Affine {
|
||||
|
||||
impl TransformTool {
|
||||
pub fn new(kind: TransformKind) -> Self {
|
||||
Self { kind, origin: None, drag: None, measure: None, hover: vec![] }
|
||||
Self { kind, origin: None, drag: None, measure: None, hover: vec![], snap: None }
|
||||
}
|
||||
|
||||
/// The effective reference point: the custom one if it belongs to the current selection,
|
||||
@@ -150,6 +156,14 @@ impl TransformTool {
|
||||
}
|
||||
}
|
||||
|
||||
/// Ends the drag, its snapping and readouts with it.
|
||||
fn end_drag(&mut self) -> Option<Drag> {
|
||||
self.measure = None;
|
||||
self.snap = None;
|
||||
self.hover.clear();
|
||||
self.drag.take()
|
||||
}
|
||||
|
||||
fn dialog(&self, o: Point) -> Action {
|
||||
Action::Dialog(self.kind.id().into(), self.kind.dialog_fields(o))
|
||||
}
|
||||
@@ -185,9 +199,13 @@ impl Tool for TransformTool {
|
||||
return out;
|
||||
}
|
||||
d.began = true;
|
||||
// The selection moves, so only the other objects are targets.
|
||||
self.snap = Some(PointSnap::new(cx, || Targets::collect(cx.doc, &cx.selection.objects, None)));
|
||||
out.push(Action::Begin(self.kind.label().into()));
|
||||
}
|
||||
let (m, text) = self.matrix_for(d.origin, d.start, p, ev.mods.shift, d.bounds);
|
||||
let (p, guides) = self.snap.as_ref().map_or((p, vec![]), |s| s.snap(cx, p));
|
||||
self.hover = guides;
|
||||
let (m, text) = self.matrix_for(d.origin, d.pick, p, ev.mods.shift, d.bounds);
|
||||
d.last = m;
|
||||
self.drag = Some(d);
|
||||
self.measure = Some((p, text));
|
||||
@@ -195,8 +213,7 @@ impl Tool for TransformTool {
|
||||
out
|
||||
}
|
||||
PointerKind::Up => {
|
||||
let Some(d) = self.drag.take() else { return vec![] };
|
||||
self.measure = None;
|
||||
let Some(d) = self.end_drag() else { return vec![] };
|
||||
if d.began {
|
||||
// The Alt state at release decides whether the result is a copy.
|
||||
vec![Action::Preview("object.transform".into(), json!({ "matrix": matrix_json(d.last), "copy": ev.mods.alt })), Action::Commit]
|
||||
@@ -207,14 +224,16 @@ impl Tool for TransformTool {
|
||||
}
|
||||
}
|
||||
PointerKind::DoubleClick => {
|
||||
self.drag = None;
|
||||
self.end_drag();
|
||||
match self.reference_point(cx) {
|
||||
Some(o) => vec![self.dialog(o)],
|
||||
None => vec![],
|
||||
}
|
||||
}
|
||||
PointerKind::Move => {
|
||||
self.hover = if self.drag.is_none() && !cx.selection.is_empty() { snap_pick(cx, p).1 } else { vec![] };
|
||||
if self.drag.is_none() {
|
||||
self.hover = if cx.selection.is_empty() { vec![] } else { snap_pick(cx, p).1 };
|
||||
}
|
||||
vec![]
|
||||
}
|
||||
}
|
||||
@@ -223,8 +242,7 @@ impl Tool for TransformTool {
|
||||
fn key(&mut self, cx: &ToolContext, key: ToolKey, _mods: Mods) -> Vec<Action> {
|
||||
match key {
|
||||
ToolKey::Escape if self.busy() => {
|
||||
self.drag = None;
|
||||
self.measure = None;
|
||||
self.end_drag();
|
||||
vec![Action::Cancel]
|
||||
}
|
||||
ToolKey::Enter => self.reference_point(cx).map(|o| vec![self.dialog(o)]).unwrap_or_default(),
|
||||
@@ -278,7 +296,7 @@ impl Tool for TransformTool {
|
||||
}
|
||||
|
||||
fn deactivate(&mut self, _cx: &ToolContext) -> Vec<Action> {
|
||||
if self.drag.take().is_some_and(|d| d.began) { vec![Action::Cancel] } else { vec![] }
|
||||
if self.end_drag().is_some_and(|d| d.began) { vec![Action::Cancel] } else { vec![] }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -428,6 +446,43 @@ mod tests {
|
||||
assert!(matches!(&a[0], Action::Dialog(_, v) if v["origin"] == json!([102.0, 98.0])));
|
||||
}
|
||||
|
||||
/// Smart Guides while a transform tool drags (#482): the drag starts from the selection's
|
||||
/// anchor it grabbed and the pointer lands on another object's anchor, so the scale is exact.
|
||||
#[test]
|
||||
fn scale_drag_snaps_from_an_anchor_onto_another_objects_anchor() {
|
||||
use vectorcraft_doc::{Appearance, Node};
|
||||
let (mut d, id) = doc_with_rect();
|
||||
let l = d.layers[0].id;
|
||||
let other = d.alloc_id();
|
||||
d.insert(
|
||||
Some(l),
|
||||
1,
|
||||
Node::path(other, vectorcraft_geom::shapes::rectangle(Rect::new(300.0, 260.0, 340.0, 300.0)), Appearance::default_art()),
|
||||
)
|
||||
.unwrap();
|
||||
let mut s = Selection::default();
|
||||
s.add(id);
|
||||
let p = paint();
|
||||
let mut c = cx(&d, &s, &p);
|
||||
let mut t = TransformTool::new(TransformKind::Scale);
|
||||
// The reference point on the top-left corner, then a drag from near the bottom-right one
|
||||
// to near the other rect's top-left corner.
|
||||
t.pointer(&c, &ev(PointerKind::Down, 100.0, 100.0));
|
||||
t.pointer(&c, &ev(PointerKind::Up, 100.0, 100.0));
|
||||
t.pointer(&c, &ev(PointerKind::Down, 199.0, 198.0));
|
||||
let a = t.pointer(&c, &ev(PointerKind::Drag, 302.0, 262.0));
|
||||
let m = matrix(&a[1]);
|
||||
assert!((m * Point::new(200.0, 200.0)).distance(Point::new(300.0, 260.0)) < 1e-9, "{m:?}");
|
||||
assert!(t.overlays(&c).iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "anchor" && *p == Point::new(300.0, 260.0))));
|
||||
t.pointer(&c, &ev(PointerKind::Up, 302.0, 262.0));
|
||||
assert!(!t.overlays(&c).iter().any(|o| matches!(o, Overlay::Label { .. })));
|
||||
// Smart Guides and Snap to Point off: the pointer is where it is.
|
||||
(c.smart_guides, c.snap_to_point) = (false, false);
|
||||
t.pointer(&c, &ev(PointerKind::Down, 200.0, 200.0));
|
||||
let a = t.pointer(&c, &ev(PointerKind::Drag, 302.0, 262.0));
|
||||
assert!((matrix(&a[1]) * Point::new(200.0, 200.0)).distance(Point::new(302.0, 262.0)) < 1e-9);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reflect_vertical_axis_mirrors_x() {
|
||||
let t = TransformTool::new(TransformKind::Reflect);
|
||||
|
||||
+10
@@ -1202,6 +1202,16 @@ point lands:
|
||||
a dragged selection, a bounding-box handle, a ruler guide or an artboard. With Smart Guides off, Snap to Point uses
|
||||
`snapToPointTolerance` instead.
|
||||
|
||||
With Smart Guides on, a bounding-box handle dragged with the Selection or Free Transform tool (`mods.shift`
|
||||
proportional, `mods.alt` from the centre) lands on another object's anchor or centre (labelled "anchor" or
|
||||
"center"), else its corners and side line up with the edges and centres of the other objects and the artboards (a
|
||||
line and "align"). The Rotate, Scale, Shear and Reflect tools start a drag from the anchor or centre they grab and
|
||||
snap the pointer as drawing tools do, so dragging a corner onto another object's anchor scales exactly onto it:
|
||||
|
||||
```json
|
||||
{"name":"pointer_gesture","arguments":{"tool":"scale","events":[{"kind":"down","x":100,"y":100},{"kind":"up","x":100,"y":100},{"kind":"down","x":199,"y":198},{"kind":"drag","x":302,"y":262},{"kind":"up","x":302,"y":262}]}}
|
||||
```
|
||||
|
||||
Not read yet: Construction Guides and their Angles, and Spacing Guides (the tools draw neither).
|
||||
|
||||
## Type preferences
|
||||
|
||||
Reference in new issue
Block a user