Commit Graph
177 Commits
Author SHA1 Message Date
dotCooCoo e0f880ab1a Arc: arcs follow the axes General › Constrain Angle turns
With a Constrain Angle other than 0° or a whole turn, an arc dragged out
with the Arc tool or placed from the Arc Segment Tool Options click dialog
is drawn along the turned x and y axes, with its bounding box turned. The
drag's box and Shift's equal lengths are measured along those axes, the
reference point stays at the drag's corner or the click, and F, C and
Up/Down keep the turn. At 0° and whole turns arcs are drawn as before.

shape.arc takes an optional rotation (degrees clockwise, about x1, y1 or
about the reference point x, y); a rotation that is not a number is an
error and adds nothing.
2026-11-15 23:50:29 -08:00
BFlat 59771c6566 Merge pull request #8002 from dotCooCoo/fix/tool-overlays-long-drag-copies
Tool overlays: long drags keep their line in shared pieces instead of rebuilding it every frame
2026-11-16 10:35:26 +07:00
dotCooCoo 56d0feddf9 Tool overlays: pieces of a long drag's line meet halfway along a segment
Each piece of a long drag's line also held the first segment of the next
piece, so that segment was drawn twice, once by each piece. Where the
line is thin or partly covered at its edges, the doubled coverage drew a
darker stretch every 64 segments. A piece now ends halfway along the
segment after its last point, and the next piece starts there, so a wide
line still turns at the piece's last point as one line does.
2026-11-15 17:10:18 -08:00
dotCooCoo 9eb6a0fc48 Merge main into feat/eraser-shift-line 2026-11-15 16:07:54 -08:00
BFlat 6a3c9cfc8b Merge pull request #7957 from dotCooCoo/feat/eraser-alt-drag-marquee
Eraser: an Alt-drag erases everything inside a marquee, a square with Shift
2026-11-16 06:55:17 +07:00
dotCooCoo 6a692299d0 Tool overlays: long drags keep their line in shared pieces instead of rebuilding it every frame
The line that a round Eraser, the Knife, the Path Eraser, the Pencil with
Live preview off or a smoothing drag shows was one path of every point,
copied, flattened and tessellated again each frame, and with the
Eraser's Size following the pen each step was a new path each frame.

- A drag of more than 64 segments now shows in pieces of 64 segments,
  each also holding the next piece's first segment so wide lines join
  as one. Pieces the drag has passed come back as the same shared path,
  and the canvas reuses their triangles while the view stays the same;
  only the last piece is built again, and only when it changed.
- With Size following the pen, each step is kept as its own shared path
  and only a new or moved step is built.
- The Knife's pieces carry where the dash pattern starts, so the dashes
  run on across pieces (Overlay::SharedPath gains `dash`).
- The smoothing band is shared until it changes.

The canvas still copies the kept triangles into each frame. Release
commands (path.eraseRegion, path.knife, path.eraseSegments,
path.freehand) are unchanged.
2026-11-15 15:36:57 -08:00
BFlat 35b88efd26 Merge pull request #7914 from dotCooCoo/fix/eraser-varied-drag-area
Eraser: the drag's area outline takes the tip the pen gives at each step
2026-11-16 04:30:09 +07: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 3e7c19829b Eraser: each step of the drag's area outline takes the tip halfway along it
A step took the tip halfway between the tips at its ends, turned the
shorter way round. The release reads the pen's pressure and tilt halfway
along the step, and its bearing and rotation halfway the shorter way
round, so a step from no pressure to full pressure with the angle on
Pressure by 90° erases with a level tip there while the outline showed
it upright. Each step now takes the tip of the pen's readings halfway
along it.
2026-11-15 11:36:38 -08:00
dotCooCoo 09a16f262f Eraser: the drag's area outline gives the first lean's bearing to the points before it
The release reads the bearing of the first point the pen leaned 1° or
more at for the points before it, while the outline kept the set value
there. The outline now takes that bearing too, and starts again when the
first lean arrives, also when a pen tilted in place at the last point
gives it.
2026-11-15 11:16:34 -08:00
dotCooCoo 70df1ff5b3 Eraser: Shift keeps the drag on a horizontal, vertical or diagonal line
With Shift held, an Eraser drag stays on the line from the press point at
the 45 degree step from the Constrain Angle that the pointer lies nearest
to. The step is taken once the pointer is 3 screen pixels from the press
and holds until Shift is released; the tip outline follows the line.
Released, the drag goes on freehand from the last point on the line, and
Shift again takes a new step from the press point.
2026-11-15 11:08:32 -08:00
dotCooCoo db61abcef0 Eraser: the drag's area outline matches the release when pressure or a mode starts mid-drag
Once the pen pressed less than fully, the steps of the outline already
built kept the tip of a stroke without pressure, while the release reads
full pressure at those points. The outline now starts again when the
pressure first counts.

A Tilt, Bearing or Rotation mode set during the drag gave the early
points the pose of later ones. The release reads no poses for such a
stroke, so the outline now keeps the set values for them too, and the
same for a Pressure mode set during the drag.
2026-11-15 10:50:23 -08:00
dotCooCoo 58fc13a1e0 Eraser: the drag's area outline takes the tip the pen gives at each step
The outline of the area an Eraser drag covers used the set Angle and
Roundness and varied the Size only with Pressure, while the release
(since #7726) erases with the tip the pen gives at each point on the
Pressure, Tilt, Bearing and Rotation modes.

Each step now takes the tip halfway between those at its ends, read as
the release reads the stroke. A step whose angle or roundness varies is
outlined where its own tip is round, and the parts inside other steps'
areas are removed as before. A pen turned in place gives the last step
the new tip, and a changed mode or Variation starts the outline again.
A round tip whose Size follows the pen shows each step that wide.
Random shows the value itself until the release draws it.
2026-11-15 10:23:55 -08:00
dotCooCoo f459465407 Contextual Task Bar: the Smooth tool shows its Fidelity and Tool Options
While the Smooth tool is in use with a path it can smooth selected, the
bar shows the tool's Fidelity field and Tool Options..., which opens the
Smooth tool's options. The field sets Fidelity through tool.setOption
with the same range, unit and steps as the field in the options dialog.
With nothing smoothable selected, the tool shows no bar. The bar leaves
out the selection tools' actions and the Fill, Stroke, Recolor Artwork
and Lock controls. On a canvas too narrow for the field, More Options
lists Fidelity, which opens the tool's options.

The Smooth tool's cursor and the bar share one check of the selection,
which the bar keeps for the document's revision.
2026-11-15 03:56:40 -08:00
dotCooCoo 397adce4c8 Merge main into feat/eraser-tip-variations 2026-11-14 18:55:44 -08:00
BFlat b46fb077b7 Merge pull request #7566 from dotCooCoo/fix/tool-overlays-reuse-settled-outline
Blob Brush: a long drag's settled outline is reused from frame to frame
2026-11-15 09:46:53 +07:00
dotCooCoo e97a7172b6 Eraser: the tip outline turns with a pen turned in place and passes 1296 pt
A drag or release within a pixel of the last stroke point now gives
that point the pen's tilt and rotation, so the outline and the erased
area follow a pen turned or tilted in place. A release without a pen
reading keeps the last pose. The outline's size on Pressure, Tilt,
Bearing or Rotation goes past 1296 pt, as path.eraseRegion sweeps it.
2026-11-14 18:03:31 -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 67fd1cd127 Merge main into feat/live-paint-bucket-multi-click 2026-11-14 15:48:45 -08:00
dotCooCoo 4573a00242 Merge main into fix/tool-overlays-reuse-settled-outline 2026-11-14 13:47:35 -08:00
ncic badf89be39 Merge remote-tracking branch 'upstream/main' into pencil-no-guides
# Conflicts:
#	docs/mcp.md
#	docs/target-app-parity.md
2026-11-14 20:32:09 +01:00
dotCooCoo 1c4cc88e90 Merge main into feat/live-paint-bucket-multi-click
# Conflicts:
#	crates/tools/src/builder/live_paint.rs
2026-11-14 10:19:24 -08:00
BFlat d89f593bfa Merge pull request #7380 from ncic/pencil-cursors
Pencil: shows where a stroke continues, connects and closes
2026-11-15 00:38:01 +07:00
dotCooCoo e385d92b1b Merge main into feat/live-paint-bucket-multi-click 2026-11-14 05:25:24 -08:00
ncic fc47e4782b Pencil: Use Precise Cursors shows the plain crosshair again; a far close is a straight segment 2026-11-14 13:23:22 +01:00
FredApps c9a199ff91 Merge branch 'main' into fix/spiral-decay-setting-20261011 2026-11-14 13:15:33 +01:00
dotCooCoo 6e2123709e Blob Brush: a long drag's settled outline is reused from frame to frame
The outline a Blob Brush or Eraser drag shows was copied, flattened and
tessellated again every frame, settled parts included, so the per-frame
cost of a long stroke grew with its whole length.

- The settled outline blocks are kept as shared paths and returned as a
  new Overlay::SharedPath; a block gets a new path only when it is
  joined again.
- The canvas keeps the mesh each shared path was drawn with, by the
  path's allocation and for the view, clip and stroke it was built for.
  A frame with the same path and view draws the kept mesh; a pan, zoom
  or rotation builds it once more. Lines outside the canvas get no
  triangles. A frame keeps only the meshes it draws.

egui still copies each kept mesh into the frame's mesh on every repaint.
The release sends the same path.blob and path.eraseRegion command as
before. The round Eraser tip's line is unchanged.
2026-11-14 03:39:39 -08:00
FredApps 4552915aae Tests: spiral decay is per full wind on main, so four segments give the decay 2026-11-14 11:35:04 +01:00
ncic 77070d29a7 Pencil: the continuation cursor follows the snapped release; Precise Cursors tests keep the badges 2026-11-14 09:22:18 +01:00
ncic cbd1c142dc Merge remote-tracking branch 'upstream/main' into pencil-cursors
# Conflicts:
#	docs/target-app-parity.md
2026-11-14 09:05:01 +01:00
ncic 3789bc27bc Merge remote-tracking branch 'upstream/main' into pencil-no-guides
# Conflicts:
#	docs/mcp.md
#	docs/target-app-parity.md
2026-11-14 08:54:32 +01: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 33319b2c4d Merge main into feat/live-paint-bucket-multi-click 2026-11-13 18:04:02 -08:00
ncic 8a449cb98e Pencil: badged cursors keep their badge with Use Precise Cursors
The Pencil's and the Paintbrush's new-path, continue, close and straight-line
cursors are drawn on the crosshair already; Precise Cursors no longer turns
them into the plain crosshair, so the badge still says what the press or the
release does.
2026-11-14 01:45:40 +01:00
dotCooCoo 6829dc02b8 Merge main into feat/smooth-cursor-without-path 2026-11-13 15:27:54 -08:00
ncic 9709c871fc Merge upstream main into pencil-no-guides
# Conflicts:
#	docs/target-app-parity.md
2026-11-13 23:52:26 +01:00
BFlat 517b725be5 Merge pull request #7089 from dotCooCoo/fix/smooth-fidelity-screen-pixels
Smooth: Fidelity is in screen pixels, so a drag smooths as much at any zoom
2026-11-14 05:42:42 +07:00
dotCooCoo ff846e1483 Merge main into feat/smooth-cursor-without-path 2026-11-13 13:50:39 -08:00
ncic eaa3efe45e Merge upstream main into pencil-no-guides
# Conflicts:
#	crates/tools/src/draw2/gesture/tests.rs
#	docs/target-app-parity.md
2026-11-13 22:49:03 +01:00
BFlat bf0f78f9c4 Merge pull request #7256 from dotCooCoo/fix/blob-brush-preview-bounded
Blob Brush and Eraser: the drag outline does a bounded amount of work per frame
2026-11-14 04:31:48 +07: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 4ea2f2e9c6 Merge main into fix/smooth-fidelity-screen-pixels 2026-11-13 13:03:29 -08:00
dotCooCoo f9e796cb10 Live Paint: double-click floods across unstroked edges, triple-click paints the same paint
With the Live Paint Bucket, a double-click on a face fills it and every
face reached across edges that are hidden or draw no stroke; a stroked
edge, a hidden face and a Gap Detection gap stop it. On an edge, a
double-click paints the edges joined to it end to end with the same
stroke paint. A triple-click fills every face of the group with the
clicked face's fill, or paints every edge with the clicked edge's
stroke. Shift and the Paint Fills and Paint Strokes options choose a
face or an edge as for a click; Alt held paints nothing.

- livePaint.fill and livePaint.strokeEdge take scope ("one", the
  default, "connected" or "samePaint") and match, the paint compared,
  and reply with count. A bad scope or match is an error, and scope
  with a drag's points is refused.
- Each click of a double-click or triple-click paints as it arrives,
  as its own undo step. For a triple-click, and for a double-click on
  an edge, the tool sends as match the paint the face or edge had
  before the first of those clicks, including a first click that makes
  the Live Paint group from the selected paths. A double-click on a
  face sends no match.
- PointerKind::TripleClick is new: the canvas sends it on egui's
  triple-click unless a modal dialog is open, as for a double-click,
  and ui.pointer and pointer_gesture take "tripleclick".

Docs: docs/mcp.md, docs/control-protocol.md, docs/target-app-parity.md.
2026-11-13 13:01:02 -08:00
BFlat 50084b789f Merge pull request #7243 from dotCooCoo/fix/smooth-segment-under-drag
Smooth: a drag along a segment smooths it when its anchors are out of reach
2026-11-14 03:23:45 +07:00
dotCooCoo add71548db Merge main into fix/blob-brush-preview-bounded 2026-11-13 12:15:59 -08:00
ncic ee52e6b167 Merge remote-tracking branch 'upstream/main' into pencil-no-guides 2026-11-13 21:09:31 +01:00
ncic 2a9c32bc39 Merge remote-tracking branch 'upstream/main' into pencil-no-guides
# Conflicts:
#	crates/tools/src/draw2/gesture.rs
#	docs/target-app-parity.md
2026-11-13 20:50:22 +01:00
FredApps 4db24740e4 Merge branch 'main' into fix/spiral-decay-setting-20261011
# Conflicts:
#	crates/engine/src/tests/toolsettings.rs
2026-11-13 20:48:28 +01:00
dotCooCoo 82bf9624bf Smooth: the cursor shows Not Allowed when no path is selected to smooth
The Smooth tool showed its own cursor with nothing selected, though a
drag then changes nothing. It now shows Not Allowed until a path it can
act on is selected (an editable path, not a guide, with three or more
anchors on one of its subpaths); a selected path anywhere on the canvas
gives the Smooth cursor wherever the pointer is.

- The Pencil with Alt key toggles to Smooth Tool on and the Blob Brush
  show Not Allowed the same way when Alt gives them the Smooth tool. The
  Paintbrush keeps its closing cursor, since its release with Alt closes
  the stroke.
- A Smooth release, from the Smooth tool or from the Pencil, Paintbrush
  or Blob Brush with Alt, sends path.smoothRegion only while such a path
  is selected. With only type or other objects selected it sends no
  command.
- Use Precise Cursors leaves Not Allowed as it is.
- The cursor catalog and docs/target-app-parity.md describe the rule.
2026-11-13 11:44:24 -08:00
dotCooCoo 51e8938374 Blob Brush and Eraser: the drag outline does a bounded amount of work per frame
The outline of the area a Blob Brush or Eraser drag covers was outlined
again for the whole stroke on every frame, so a long stroke slowed the
canvas as it grew.

- The drag is outlined in pieces of up to 32 segments (one segment each
  with Size set to Pressure), and a frame outlines again only the pieces
  it added segments to. A grid of squares lists the segments near each
  square, and each piece's outline drops the parts inside the rest of
  the area, so the pieces show as one edge.
- One frame takes at most 256 new points and a fixed amount of work;
  Tool::overlays_pending makes the canvas draw again until the rest is
  done with the pointer still. Points not outlined yet show as a thin
  line, and the tip shows at the pointer.
- The settled outline is kept in joined paths of 64 pieces, and a frame
  joins again only the paths that changed. The grid's size is capped.
- The Blob Brush's length label and the Size-by-pressure check keep
  running values instead of rescanning the stroke each frame. With Size
  set to Pressure the outline shows only the edge of the whole area.

The release sends the same path.blob and path.eraseRegion parameters.
2026-11-13 11:40:53 -08:00