Commit Graph
47 Commits
Author SHA1 Message Date
yoriswind 3f09579dcd Merge upstream main to resolve PR #6601 documentation conflicts 2026-11-18 02:41:17 -08:00
BFlat 9e811a7d05 Merge pull request #8422 from dotCooCoo/fix/path-freehand-connect-needs-extend
Pencil: path.freehand refuses connect without extend
2026-11-18 13:11:10 +07:00
BFlat 18f8c57a5a Merge pull request #8037 from dotCooCoo/fix/erase-segments-width-bound
Path Eraser: path.eraseSegments refuses a width outside 0.001 to 1000 pt
2026-11-18 10:21:33 +07:00
dotCooCoo 6252d4b29e Pencil: path.freehand refuses connect without extend
path.freehand ignored a connect given without extend and drew a new
path. It now refuses it with "connect needs extend". A connect given
with extend is checked (its id, a path other than the one extended
with an open end, and an end of "start" or "end") before a stroke of
one point returns, so a bad connect is refused there too, and
brush.freehand no longer changes the path's brush or the selection
before refusing it. A null connect is still a key left out.

Docs: params text, docs/mcp.md, docs/target-app-parity.md. i18n: the
new message in the catalogs that carry the other connect messages.
2026-11-17 11:56:49 -08:00
yoriswind 1904657eb5 Merge main and preserve independent Eraser progress notes 2026-11-17 04:07:48 -08:00
dotCooCoo aac6250a07 Merge main into fix/blob-params-rejected 2026-11-16 12:01:23 -08:00
yoriswind ffa507e293 M2: reconcile Eraser imports with current Scissors changes (#6582) 2026-11-16 09:44:37 -08:00
dotCooCoo a10c403df6 Scissors: paths a cut makes have every stroke aligned Center
path.split (Scissors) and path.cutAtAnchors (Cut Path at Selected
Anchor Points) keep the source path's fill and stroke settings on the
paths they make, and now set every stroke's alignment to Center in the
same undo step, as the help page describes:
https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-paths/split-paths.html

Every stroke row is reset, hidden ones included. A path of several
subpaths has one appearance, so its other subpaths' strokes are
centered too, and a cut member of a compound path centers the compound
path's strokes. An appearance whose strokes are already centered is
left shared. Knife, the erasers and Divide are unchanged.
2026-11-16 03:46:53 -08:00
dotCooCoo ea5ab86429 Path Eraser: path.eraseSegments refuses a width outside 0.001 to 1000 pt
path.eraseSegments checked only that `width` was a positive number, so a
width such as 1e300 erased every selected path and a width such as 1e-300
sampled the path too coarsely to find the band. It now refuses a width
outside 0.001 to 1000 pt with "`width` must be from 0.001 to 1000" before
reading the document; nothing changes and no undo step is recorded. Left
out or null, the width is still 8 pt. The range is VectorCraft's own: it
holds every width the Path Eraser tool sends across the view zoom and UI
Scaling limits, and its top matches the Eraser's largest Size.
2026-11-15 21:35:25 -08:00
yoriswind 3d5cce66e1 M2: reconcile gradient-preserving Eraser fix with main (#6582) 2026-11-15 21:22:58 -08:00
dotCooCoo fcc8bd2c83 Merge main into fix/blob-params-rejected 2026-11-15 20:51:54 -08:00
yoriswind 2315dc39d5 M2: reconcile open-fill Eraser with current main (#6582) 2026-11-15 18:43:14 -08:00
dotCooCoo b697ecbf07 Merge main into fix/erase-region-params-refused 2026-11-15 18:40:58 -08:00
dotCooCoo 8d50d3f911 Merge main into fix/blob-params-rejected 2026-11-15 18:36:57 -08:00
yoriswind 9db12a27f2 M2: preserve open fills with rectangular erasing 2026-11-15 18:30:22 -08:00
dotCooCoo 418ae818e5 Merge main into fix/erase-region-params-refused 2026-11-15 16:06:28 -08:00
dotCooCoo 46e5ab21e0 Merge main into fix/pen-input-params-pressure-tilt-rotation 2026-11-15 16:06:17 -08:00
dotCooCoo 6c74a77a6d Eraser: an Alt-drag erases everything inside a marquee, a square with Shift
With Alt held at the press, an Eraser drag draws a marquee from the press
point to the pointer instead of a stroke, and the release erases everything
inside it. Alt+Shift keeps the marquee square on its larger side, Escape
cancels it, and a click or a drag along one axis erases nothing.

path.eraseRegion takes {rect: [x, y, width, height]} in place of points.
Closed paths lose the rectangle's area; open paths are cut where they cross
its edges, found from the exact crossings, so a narrow rectangle across a
long segment still cuts it. A width or height of 0 or less, a non-finite
value, or points and rect together is an error, and nothing erased adds no
undo step.

Docs: docs/mcp.md, docs/ui-parity.md.
2026-11-15 12:13:13 -08:00
dotCooCoo 0b34f7b5c0 Merge main into fix/blob-params-rejected 2026-11-15 06:08:47 -08:00
dotCooCoo 495513f0b6 Pen input: out-of-range pressure, tilt, rotation and size values are refused
The drawing commands that read pen values at their points (path.freehand,
brush.freehand, path.knife, path.eraseRegion, path.eraseSegments,
path.smoothRegion, path.joinScrub and path.blob) now refuse a pressure
outside 0 to 1, a tiltX or tiltY outside -90 to 90 and a rotation outside
0 to 360, naming the key. A tilt was kept within range and a pressure or
rotation was passed on. A point array of more than six numbers is refused,
naming the point, instead of having its extra entries ignored.

path.blob and path.eraseRegion refuse a size outside 0.1 to 1000 pt, the
range of the Blob Brush and Eraser tool options. path.blob refuses a
sizeVariation outside 0 to 1000 pt in every sizeMode and with the mode left
out. path.eraseRegion refuses a sizeVariation over 1000 pt in every mode
with the same message, and a negative one still gives "sizeVariation must
be 0 or more". Each refusal leaves the document, the selection and the
undo history unchanged; null and omitted values still take the defaults.

The tip variation test uses a 1000 pt tip and a 1000 pt Fixed variation,
the largest values path.eraseRegion now takes.

Docs: params text, docs/mcp.md, docs/target-app-parity.md.
2026-11-15 03:28:25 -08:00
dotCooCoo 4a0332e30f Merge main into fix/erase-region-params-refused 2026-11-14 20:42:40 -08:00
dotCooCoo 6c585de940 Eraser: Angle, Roundness and Size vary with Random, Pressure, Tilt, Bearing or Rotation
Eraser Tool Options gives Angle, Roundness and Size each a variation menu
(Fixed, Random, Pressure, Tilt, Bearing, Rotation) and a Variation field.
path.eraseRegion takes angleMode, roundnessMode and sizeMode with their
variations, sweeps a varying tip as a Calligraphic nib with what the pen
read along the drag, and refuses an unknown mode or a variation out of
range. The Eraser records the pen's pressure, tilt and rotation when a
mode follows them, and its tip outline at the pointer takes the angle,
roundness and size the pen gives while it erases.
2026-11-14 17:08:14 -08:00
dotCooCoo de515d4f73 Merge main into fix/erase-region-params-refused 2026-11-14 13:46:21 -08:00
dotCooCoo f39ee6ae23 Merge main into fix/blob-params-rejected 2026-11-14 13:42:15 -08:00
dotCooCoo 3674865d62 Merge main into feat/smooth-keeps-corners 2026-11-14 09:42:14 -08:00
dotCooCoo 884c27909b Merge main into fix/blob-params-rejected 2026-11-14 09:39:19 -08:00
dotCooCoo 2b64456e5c Smooth tool: keep corners where the path turns by more than 57.5°
The Smooth tool refit every anchor in the smoothed stretch with a corner
angle of 179°, so a drag across a corner rounded it off. An anchor is now
kept as a corner when the path turns there by more than 57.5° (an
interior angle under 122.5°) at the anchor itself, over the Smooth
radius and over twice the radius on either side. On a closed path the
distances are no more than an eighth of its length. The stretch is cut
at each corner, each part is refit on its own, and the corner keeps its
position. The threshold is the same on every pass and has no setting.

A jag or bump smaller than the radius is not kept: the path does not
turn by that much over twice the radius. A whole closed path with
corners keeps its start anchor when the refit keeps an anchor there. A
drag that changes nothing adds no anchors and no undo step.

Docs: params text for path.smoothRegion, docs/mcp.md,
docs/target-app-parity.md.
2026-11-13 19:01:56 -08:00
ncic 5a55fdce0e Merge upstream main into pencil-cursors
# Conflicts:
#	docs/mcp.md
#	docs/target-app-parity.md
2026-11-14 03:17:11 +01:00
dotCooCoo 5002b6ac8c Eraser: path.eraseRegion refuses an angle or roundness outside its range
path.eraseRegion clamped roundness to 1-100 and used any finite angle
as given, so a stroke with roundness 400 or 0 erased like one with 100
or 1, an angle of 540 erased like 180, and the call did not report the
bad value. It now refuses an angle outside -180 to 180 degrees and a
roundness outside 1 to 100% with an error naming the key and the range,
and the document does not change. A key left out or null still takes
its default (0 degrees, 100%).

path.split refuses a t outside 0 to 1 the same way. Before, such a t
cut at the segment's end anchor with `segment` and was ignored with
`anchor`.

The Eraser's ranges match its Tool Options fields and are VectorCraft's
own values. The help page gives no range for Angle or Roundness:
https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-paths/erase-paths-using-eraser-tool.html

Adds @msg rows for the two Eraser messages to every complete catalog.
2026-11-13 16:40:54 -08:00
dotCooCoo 447e1f898e Blob Brush: path.blob rejects invalid fidelity, angle and roundness
path.blob used to clamp a supplied angle to -180..180, a roundness to
0..100 and a fidelity to 0.01..100 pt, so a value such as 200 or -1
painted with a different value than the one given. It now returns an
invalid-parameters error for a value outside its range, before the
document changes, and records no undo step. A key left out or null
still takes its default: 0 degrees, 100% and no fitting.

path.freehand (and brush.freehand) treated any style other than
"brush" as "pencil", and any extend end other than "start" as "end".
It now rejects an unknown style or extend end with an error, as it
already did for connect end; left out or null, they keep their
defaults.

The new messages have rows in every complete-message catalog, and the
connect end message gets rows in the catalogs that lacked one.

Docs: path.blob and path.freehand params text, docs/mcp.md,
docs/target-app-parity.md.
2026-11-13 15:39:31 -08:00
ncic b67a08dc0a Pencil: shows where a stroke continues, connects and closes
The continuation cursor (a short rising line) shows over an open end of a
selected path before any press, freehand too, and while a continuing stroke
nears an open end of another selected path it connects to. The straight-line
cursor becomes a short level line. A stroke continuing a path, a straight line
too, shows the closing ring within Close Paths When Ends Are Within of the
path's other end, and the release closes it; path.freehand takes the tool's
closed for extend instead of its own four-Fidelity distance.
2026-11-13 22:29:09 +01:00
dotCooCoo 1b935b6d0a Merge main into fix/smooth-fidelity-screen-pixels 2026-11-13 10:13:12 -08:00
dotCooCoo 6e361b0bec Pencil: Fidelity keeps its screen size at low zoom
The Pencil and the Paintbrush send their Fidelity in points at the
current zoom, but path.freehand read at most 100 pt. At 3.13% zoom a
20 px Fidelity (639 pt) was fitted at 100 pt, the same as 3.13 px on
screen, so a stroke drawn zoomed out kept far more anchors than the
same stroke at 100%.

- path.freehand, and brush.freehand, which runs it, take a Fidelity
  from MIN_FIT_TOLERANCE to MAX_FIT_TOLERANCE (100 / 0.0313 pt, the
  100 px field maximum at the lowest zoom). A value outside that range
  is now rejected with an error instead of being read as the nearer
  end. The default stays 1.5 pt and path.blob keeps its 100 pt bound.
- The Pencil and the Paintbrush keep the value they send within that
  range, so a stroke draws at any zoom.
- An extending stroke still closes the path within four Fidelities of
  its other end, at most 400 pt, as before.

It conflicts with open #7089 in crates/tools/src/draw2.rs.

Docs: docs/mcp.md, docs/target-app-parity.md, path.freehand params.
2026-11-13 04:35:29 -08:00
dotCooCoo 1c0310a1d5 Smooth: Fidelity is in screen pixels, so a drag smooths as much at any zoom
The Smooth tool, and an Alt smoothing drag with the Pencil, Paintbrush or
Blob Brush, now send path.smoothRegion their Fidelity divided by the zoom,
as the Pencil and the Paintbrush do since #5748. Smooth Tool Options shows
Fidelity in px. A saved Fidelity keeps its number, so it smooths as before
at 100% zoom.

path.smoothRegion now refits at tolerances from 0.05 px at the highest zoom
to 100 px at the lowest (0.000078125 to about 3195 pt) instead of clamping
to 0.05 to 100 pt, so the setting keeps scaling across the whole zoom range.
2026-11-13 01:18:06 -08:00
HassanKhan b3860bf7d0 Commands: every angle and rotation param says which way it turns (#6340)
The params docs now state the direction (and the zero) of each angle or
rotation a command takes; behaviour is unchanged. Shape creation, text.create,
the grids, add-on shapes, saved views, Liquify, Puppet Warp pins, Mirror and
Radial Repeat and Vector Halftone turn clockwise; text character rotation,
gradients, the eraser tip and print screen angles turn counter-clockwise.

view.saved.new's rotation note changes its schema, so the API level goes to 3.

A test walks every command's params doc and fails when a param named like an
angle or rotation doesn't say clockwise or counter-clockwise.
2026-11-11 21:40:27 +05:00
dotCooCoo 7eb1006abb Scissors: a cut leaves one of the two new end points selected
After a Scissors cut (`path.split`) the whole path stayed selected: both
pieces of an open path, or the opened path of a closed one. A Direct
Selection drag from the cut then moved every anchor, so an ellipse cut
at an anchor could not be pulled open by dragging its end.

- `path.split` selects the first anchor of the piece after the cut and
  nothing else, as `path.cutAtAnchors` does: anchor 0 of an opened
  closed subpath, of the new path when an open path becomes two, or of
  the subpath added to a path of several subpaths.
- A Direct Selection press on anchors of a selected path that lie on top
  of each other takes the selected one. It took the first in path order,
  which in a path of several subpaths was the unselected end.

Docs: docs/mcp.md, docs/target-app-parity.md, the `path.split` params
text.
2026-11-10 15:04:50 -08:00
Don Omondi b976de560d Join tool: scrubbing the ends of two crossing paths trims them and joins the paths at the crossing (#5844)
The Join tool drew a segment between the open ends of two crossing paths
instead of trimming what overhangs the crossing. path.joinScrub now looks for
two crossing open subpaths whose overhanging ends the scrub runs over, cuts
both at the crossing and joins the kept parts there with a corner, in one undo
step. Without a crossing the endpoint join is unchanged.
2026-11-06 05:32:24 +07:00
Alex 9e2e0e0f69 Pencil: a new stroke with Keep selected off leaves nothing selected (#5752)
Drawing a new Pencil or Paintbrush stroke kept the earlier selection: the engine's
`insert_look` selects the new path only when `keepSelected` is on, and with it off left the
selection as it was. Illustrator starts such a stroke by dropping the selection, and the new
stroke is not selected with Keep selected off, so the command now clears the selection after
inserting a new path.

What stays as before: with Keep selected on a stroke selects only the path it draws (the
earlier selection is replaced); a stroke that continues or redraws a selected path with Keep
selected off deselects that path and keeps the rest of the selection. The Blob Brush keeps its
own Keep selected and Merge only with selection options.

`path.freehand`'s documentation, the engine test
`pencil_with_keep_selected_off_leaves_nothing_selected` and the Tool Options test
`the_new_path_is_selected_only_with_keep_selected_on` cover the three cases. Docs: roadmap,
target-app-parity and ui-parity carry the change.
2026-11-05 23:42:01 +07:00
dotCooCoo e8e09af782 Brushes: Calligraphic and Scatter values follow pen tilt, bearing and rotation
Squashed from #5031 onto main.
2026-11-02 14:33:02 +07:00
dotCooCoo baaffd63e7 Blob Brush: Tool Options set the brush's Angle and Roundness
Blob Brush Tool Options gain Angle (-180 to 180 degrees, 0 by default)
and Roundness (0 to 100 percent, 100 by default), with a preview of the
tip and three dabs; a drag in the preview square sets the Angle. The
elliptical tip keeps its angle on the page along a stroke, a 0 percent
tip is drawn 0.1 percent as wide as it is long, and Size set to
Pressure still varies its size. path.blob takes angle and roundness,
and both values are kept with the tool's options.

While a non-round tip drags, the Blob Brush shows the outline of the
area it covers with its length label, and an Alt drag that smooths
shows the Smooth tool's thin line.
2026-10-31 19:43:15 +07:00
bflatastic 71fbdf5ff0 Eraser: Size follows the pen pressure too (#3961)
Eraser Tool Options' Size takes Fixed or Pressure and a Variation as the
Blob Brush's does: the tool records the pen, and path.eraseRegion outlines
the squashed drag at the pen's widths, stretched back to the tip's angle
and roundness. The pressure parsing and outline move to draw2's common
helpers, shared by both commands.
2026-10-30 01:13:20 +07:00
bflatastic c65286666c Blob Brush: Size follows the pen pressure (#4590)
Blob Brush Tool Options' Size takes Fixed or Pressure and a Variation, as
the brush options' Size does: with Pressure the brush is Size − Variation
wide where the pen presses lightest and Size + Variation where it presses
hardest. The tool records the pen pressure of each point and shows each
step of the drag as wide as the pen pressed there; path.blob takes
[x, y, pressure] points with sizeMode and sizeVariation and outlines the
stroke with that width profile. A stroke without pressure keeps the Size,
and Fixed with no variation stays the default.

https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/blob-brush-options-and-best-practices.html
2026-10-30 01:13:13 +07:00
dotCooCoo 7f7067bcba Blob Brush: Tool Options set its Fidelity
Squashed from #4414 onto main.
2026-10-29 10:11:42 +07:00
dotCooCoo 3593dd4b0d Blob Brush: a stroke merges with the topmost matching path and its neighbors in its group or layer
A Blob Brush stroke used to merge with every closed path of its fill
color and no stroke that it touched, anywhere in the document, across
layers and groups and past objects of other kinds. It now merges with
the topmost such path it touches, and with the other touched matching
paths in the same group or layer that are next to that path in
stacking order, with no other kind of object between them. Merge only
with selection still limits the candidates to selected paths. The
merged path keeps the topmost path's id and place.
2026-10-29 10:10:59 +07:00
dotCooCoo 686cd1f2f5 Curvature: deleting a point re-curves the path through the remaining points
Deleting a point of a finished path with the Curvature tool sent
path.removeAnchor, which refits the two segments that met at the point so
one curve follows them. The path kept the bend of the deleted point
instead of curving through the points that remain.

The tool now sends path.removeAnchor with curvature: true, which uses the
new curvature_remove. Each smooth neighbor takes new handles from its new
neighbors, and an end beside one of them takes its end handle again. A
corner neighbor keeps its handle directions, and its handle on the new
segment scales with the segment's chord. With two points left, the points
that curve lose their handles. Object > Path > Remove Anchor Points and
the Delete Anchor Point tool still refit the curve.
2026-10-29 10:00:30 +07:00
Dylan M. Taylor 7043ef6f3d Extract geometry command helpers 2026-10-28 16:44:11 +00:00
aiongg 71aef5cc85 refactor(engine): move cmd/draw2.rs items to cmd/draw2/{anchors,commands,common,cut,freehand,smooth}.rs 2026-10-26 22:01:25 +00:00