Khawar Zamman WaniandFredApps
e1145b604e
* Add path text placement ranges and drag gestures * Preview path placement and track bounded canvas damage * Preserve legacy path anchors and show overflow markers * Match path marker hit targets and directional cursors * Fix path placement lint failures * Cover path text body movement and position locks * Keep open path text movable at range endpoints * Target the type path after attaching text * Fix path text range rendering and placement lifecycle * Map vertical path text and preserve drag branch continuity * Cover path placement lifecycle and preview damage regressions * Preserve closest branch projection and fix CI regressions * Normalize path endpoints and bind gestures to their viewport * Simplify viewport ownership guards for Clippy * Document path placement invariants and regression cases * Fix path placement ownership, validation and geometry caching * Correct path placement regression fixtures * Ignore transient path geometry cache in UI state equality * fix: allow path text flips with stale placement ranges * fix: retain path text handles after shortening curves * test: account for layer translation in path placement drags * fix: mark path text range with x and o markers on the path The beginning marker is an x and the end a small circle, both on the path, with a plus in the circle while the range hides glyphs. The cursor's triangle points right over the beginning, left over the end, and both ways over the text body, which moves the whole range. Direct Selection leaves an anchor or handle under a marker to path editing; Path Selection always takes the marker. * fix: resolve coincident path text markers by lap or drag direction The x and o markers coincide on a closed path's full lap and on an empty or end-clamped open range. A full lap now moves the whole text; otherwise the first motion picks the beginning (backward) or the end (forward). Marker fixtures press on the path, where the markers now sit. * fix: let either end of a full-lap path text range be dragged Text attached to a closed path fills one lap, so its x and o markers coincide and every press moved the whole text, leaving no way to shorten the range. As the text begins just ahead of that point and ends just behind it, a press ahead along the path now grabs the beginning and one behind grabs the end; the point itself still moves the whole text. * test: check full-lap marker drags do not flip the text * fix: read and write the path text range in PSD Type on a path keeps its range in the Txt2 frame as /2 /6 [start end], in curve-segment units with -1 for the default. Three reference-editor files in ag-psd's test set fix the mapping: text-path ends a third into the first segment and draws only "so" of "some text", and text-path-26/27 move the start on an open path. Import reads both ends (and the flipped flag) into the layer's start and end. Export writes an open path whole with its start and end in the range, instead of cutting the path at the start, and a closed path's limited end as a range from its start. Path text in a document that never came from a PSD now gets a Txt2 block, so its path is saved at all, and the warning that the end limit is lost is gone. * fix: let both selection tools grab a path text marker on an anchor Direct Selection gave an anchor under a marker the click, so an open path's default markers (on its end anchors) and a closed path's coincident full-lap markers (on its first anchor) could not be moved with that tool. In the reference editor either selection tool drags a marker wherever the pointer shows the text bar with a triangle, so the marker now wins for both tools. The Direct Selection tests for reshaping a type path (#9114) drag its last anchor, where the default end marker sits; they now end the range short of it. To reshape at an anchor under a marker, drag the marker off it or select the anchor with a marquee and nudge it. * fix: keep explicit and empty path text ranges through PSD An explicit end at the path's end stays explicit, so centered and right type keeps its alignment within the span. A closed range whose ends meet reads as empty, not as a full lap. * ci: re-run checks after a download outage * ci: re-run checks after a download outage * fix: preserve legacy path text anchors through PSD * ci: re-run checks against current main --------- Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
5.5 KiB
Path-text placement
Path Selection and Direct Selection can adjust the active type layer's text range independently of its curve. The beginning of the range is marked on the path with an x and the end with a small circle. Drag either marker along the curve to change that boundary; drag the text to move its paragraph anchor and both boundaries while they fit. At an open endpoint the range shortens so a range already reaching the endpoint remains movable. Crossing the curve flips the side and direction. Escape discards the current gesture; release commits one undo step. Character-panel Baseline Shift moves text across the curve without changing direction.
The pointer shows what a press grabs: an I-beam with a right-pointing triangle over the beginning marker, a left-pointing triangle over the end marker, and both triangles over the text, which moves as a whole. Where the markers coincide on a closed path's full lap (the default for text attached to a closed path), a press just ahead along the path grabs the beginning, one just behind grabs the end, and one on the point moves the whole text; on an empty or end-clamped range the first motion picks the marker, backward the beginning and forward the end. Both tools take a marker before the path under it, as the reference editor does: a marker on an anchor (an open path's default markers sit on its end anchors) is dragged, not the anchor. To reshape the path at such an anchor, drag the marker off it first, or select the anchor with a Direct Selection marquee and nudge it with the arrow keys.
The on-canvas preview uses the native text renderer. Its cached document leaves document history unchanged while dragging, and repaint damage is limited to the old and new text areas. The end circle shows a plus inside while the path range hides drawable glyphs.
Data and automation
type.setPathPlacement updates an existing path-text layer. Parameters are layer (optional, defaults to the active layer), start (optional pixels), end (optional pixels, or null for legacy placement), and flip (optional boolean). Omitted values are preserved, so a request can update only one property. end: null clears the end limit and restores legacy placement. An explicit end must be greater than or equal to start; invalid ordering is rejected. Position and full-layer locks prevent placement changes.
Offsets are measured in the text layer's local space, along its current direction of travel. An explicit end is unwrapped: equal start/end means no capacity, and an end one path length after the start means a full closed lap. The renderer limits closed paths to one lap. Native .pcraft files preserve the range; older files without an end retain legacy placement until an actual edit.
Reference behaviour and remaining verification
The markers, cursors and gestures follow the reference editor's documented behaviour: an x and a circle mark the beginning and end, a plus in the circle signals overflow, the I-beam's triangle points right at the beginning and left at the end, and dragging across the path flips the text, unlike baseline shift. Direct side-by-side comparison is still required before claiming exact parity.
PSD stores the range in the type layer's Txt2 frame as /2 /6 [start end], in curve-segment units (segment index plus Bézier parameter; -1 is the default). Three reference-editor files in ag-psd's test set (MIT) fix the mapping: text-path (CS6) limits the end a third into the first segment and draws only "so" of "some text", and text-path-26/-27 (2024) move the start on an open path. PhotoCraft reads both ends and writes them back. An open path is saved whole, with its start and end in the range, as those files do. A closed path keeps its start in the path and saves a limited end as a range from there, within one lap; no reference file shows a closed path with a moved range. Flipped type is still saved as the path run backwards; a file's flipped flag (/2 /11 /0) is read as the same stretch of path from the other end, which no reference file shows yet.
Manual comparison protocol
Use the same font, size, content, baseline shift, and alignment in PhotoCraft and the reference editor.
- Create an open curve and a circle, then add path text. Test left, center, and right alignment.
- Select each path-selection tool in turn. Check the
xand circle markers, the right/left/double triangle cursors and both tools on a marker that sits on an anchor. - Drag each marker along the path. Shorten the interval until text overflows; check the plus in the end circle and hidden glyphs.
- Drag the text along the curve and across it. Check the occupied path interval, direction, and baseline side before and after a flip.
- Cross a closed-path seam in both directions. Check for jumps and duplicate text. Repeat after zoom, view rotation/mirroring, and a skewed layer transform.
- Repeat the first drag on an older native file with centered/right-aligned text and no explicit end. Check for an unexpected placement jump.
- Cancel with Escape, undo/redo completed drags, switch documents during a gesture, and try a position-locked layer.
- Save/reopen the native file. Export to PSD, open it in the reference editor and back, and check the start, end, overflow and flip.
Automated regression tests cover the model, bounded layout, caret projection, marker/body gestures, flipping, history, locks, transformed marker targets, preview caching, repaint damage, and native persistence. Remote CI results and this manual comparison must be assessed separately.