Commit Graph
420 Commits
Author SHA1 Message Date
David Mann 80b6f3d9b3 Merge remote-tracking branch 'origin/main' into pr-6215
# Conflicts:
#	docs/gaps.md
#	docs/ui-parity.md
2026-11-09 17:06:19 +01:00
6121e884ba Merge origin/main into PR #12402 (docs/ui-parity.md change log: keep both rows)
Co-Authored-By: Trevor Brown <trevorbrown.dev@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-09 15:49:09 +01:00
David Mann e06ba09af4 Merge remote-tracking branch 'origin/main' into pr-6215
# Conflicts:
#	docs/gaps.md
#	docs/ui-parity.md
2026-11-09 14:38:19 +01:00
Tim BrittandClaude Fable 5.1 4f2be5f14d Address CodeRabbit review: keep a move shape-true, never clamp a stored depth, adopt a stored warp only with its preview (#9798)
A surface drag moves the cylinder without touching its shape, however narrow;
the bend handle shifts both arcs' depths by the same amount and a depth past
the limit is kept as it is rather than clamped by a press; a stored warp is
edited only when its source could be previewed without it, else the box keeps
a fresh mesh as before; the depths and wrap of a cylinder are compared with a
dimensionless tolerance; the parity row names the placements that keep a
stored cylinder editable. Also the explicit imports main now requires.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:43 +00:00
Tim BrittandClaude Fable 5.1 5872941b12 Warp mode: the cylinder's grid and handles as the reference's, and a stored warp previews unwarped (#9798)
The cylinder is outlined and cut into a 3 × 2 grid (two horizontal curves and
the centre line) that hugs the warped picture. The handle in the middle of the
upper arc sets the bend of both arcs, the one in the middle of the lower arc the
lower edge's height, and the wrap handle sits at the grid's centre and slides to
the right (starting 15 % along), stretching the middle of the picture and
squeezing its sides round the back.

A smart object's stored warp used to enter Warp mode with the layer's already
warped render as the preview texels, which the mesh then warped again, so the
picture never sat on the grid: the session now previews the source placed
without the warp over the warp box. Edit › Transform › Warp carries a check
while the active layer is warped, as the reference's does.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:43 +00:00
Tim BrittandClaude Fable 5.1 5e7bccc4d8 Address review: match the reference's Cylinder editor (#9798)
As a maintainer compared it with the reference application: Bend, H and V stay
in the bar, greyed (no Top/Bottom/Wrap fields); the starting cylinder has its
four corners on the box and both curves 50 % deep; five handles (the top-right
and bottom-left corners, the front of each curve, a wrap handle near the middle
dragged sideways); a drag on the surface moves the whole cylinder; the overlay
is the two curves and the centre line, not a grid.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:28 +00:00
Tim BrittandClaude Fable 5.1 4243427390 Warp mode: edit Photoshop's Cylinder warp with handles and fields (#4112)
The Warp menu lists Cylinder after the presets (not on type). Picking it starts
a cylinder fitted to the box; handles set its seven values: the corners move a
silhouette and an edge, the middle of a silhouette moves it alone, the middle of
the top and bottom edge sets that ellipse's depth, and a drag across the surface
turns the contents round the cylinder. The options bar shows Top, Bottom and
Wrap in place of Bend, H and V, with Split, Grid and the orientation switch
greyed. The warp stays a cylinder through the commit, so a smart object keeps it
as `warpCylinder`.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-09 04:36:28 +00:00
David Mann f88fa5e431 Merge remote-tracking branch 'origin/main' into pr-9272
# Conflicts:
#	docs/ui-parity.md
2026-11-09 00:49:57 +01:00
David Mann 6a3b1a7dfa Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-08 23:56:07 +01:00
David MannandClaude Opus 5.5 4ebd2da168 Regenerate scorecard after merging main; preference counts of 199
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 23:55:07 +01:00
David Mann 61dfc33a04 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-08 23:28:28 +01:00
David Mann bdcbb0fa93 Merge origin/main into fix/hue-range-zone-drag 2026-11-08 22:24:05 +01:00
David Mann 0832f01bb7 Merge origin/main into feat/smart-sharpen-canvas-preview 2026-11-08 22:24:00 +01:00
Trevor BrownandClaude Sonnet 5.5 a45699a4fe Actions panel: a row dragged onto the trash is deleted, onto Create new action duplicated (#12373)
The Actions panel rows carried a drag payload that only the reorder drop understood, so dropping a row on the footer trash or on Create new action did nothing. The footer buttons now take the drop (the trash deletes the dragged row, the plus duplicates it right after itself) through shared delete_row and duplicate_row helpers that also keep the selection and disclosure rows right, with a hover highlight and the same recording rules as the buttons. Tests drive real pointer drags for step and action rows onto both buttons, a drop on empty space, and a drop on the trash while recording.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Model-Effort: Opus 5.5 drove and briefed; Sonnet 5.5 wrote at medium
2026-11-08 15:03:19 -05:00
David Mann 8c6f5d538e Merge origin/main into fix/gradient-stop-drag-off (#10823)
# Conflicts:
#	docs/ui-parity.md
2026-11-08 02:33:41 +01:00
David Mann 9849f778d8 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-08 01:43:45 +01:00
David Mann 81971d3e6b Merge remote-tracking branch 'origin/main' into pr-9272 2026-11-08 01:38:34 +01:00
e812bfcbae Merge origin/main into feat/smart-sharpen-canvas-preview (#9981)
Conflict only in the docs/ui-parity.md status line: kept both entries.

Co-Authored-By: ljkx <ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 01:22:40 +01:00
47e14b5da2 Photo Filter keeps only Preserve Luminosity from its last OK (#9970)
#9970 reopened Image > Adjustments > Photo Filter... at the filter, colour,
density and Preserve Luminosity of its last OK. Measured in the reference
application: after OK at 60, 70 and 74 %, with a preset or with Color and a
custom colour, it reopens every time at Warming Filter (85), the orange
swatch and 25 %; only Preserve Luminosity carries over (off after an OK with
it off, on after an OK with it on). Opening now starts from the neutral
settings and takes just that one value from the last OK; Alt still reopens
at all the last settings (#8900). Tests and the ui-parity row follow the
measured behaviour.

Co-Authored-By: ljkx <177671075+ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 00:30:59 +01:00
David Mann 2da9714b74 Merge origin/main into feat/photo-filter-last-settings
# Conflicts:
#	crates/ui-egui/src/panels/smart_ui.rs
#	docs/ui-parity.md
2026-11-08 00:16:29 +01:00
c951b80e27 Merge origin/main into fix/gradient-stop-drag-off (#10823)
#10797 landed the Gradient Map drag-off and a shared off_strip() on main.
Conflicts resolved to main's Gradient Map code and main's off_strip(): a
stop comes off the bar dragged up or down, as measured in the reference
application, so the PR's directional stop_dragged_off() is dropped and
Layer Style's Gradient Overlay uses off_strip() too.

Co-Authored-By: ljkx <ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 22:17:30 +01:00
David Mann 3b9a8b5b30 Merge remote-tracking branch 'origin/main' into pr-9272
# Conflicts:
#	docs/ui-parity.md
2026-11-07 20:33:40 +01:00
David Mann 9a079c811f Merge remote-tracking branch 'origin/main' into pr-8485-merge
# Conflicts:
#	docs/ui-parity.md
2026-11-07 19:28:44 +01:00
61a7cffbd5 Merge origin/main into feat/smart-sharpen-canvas-preview (#9981)
Conflict: docs/ui-parity.md status line keeps main's Reset Transform entry
and #9648's.

Co-Authored-By: ljkx <ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 19:14:16 +01:00
53ea374123 Filter preview locator: only the press centres the preview (#9981)
In the reference application's filter dialogs (measured with Unsharp Mask)
a press on the image centres the preview window there, but dragging on
afterwards leaves it: neither the held moves nor the release move it. The
locator here followed the drag, on the canvas and through ui.pointer. Now
only the press centres it, so the held-press state ui.pointer kept across
requests (__pvPointerDown, clear_pointer_state) is gone, and the tests
check that a drag stays where it was pressed.

Co-Authored-By: ljkx <ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 19:13:20 +01:00
ed3a95a0c4 Merge origin/main into feat/smart-sharpen-canvas-preview (#9981)
Conflicts: canvas.rs and dispatch.rs keep main's Gradient Overlay drag and
sampler release_taken_drag next to the preview locator; cursors.rs keeps
main's cached Paint Bucket cursor beside preview_locator_cursor; ui-parity.md
keeps both status lines and revision rows.

Co-Authored-By: ljkx <ljkx@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 18:43:06 +01:00
David Mann 7bafe90c64 Merge remote-tracking branch 'origin/main' into pr-9272
# Conflicts:
#	crates/ui-egui/src/dialogs/adjust_editors/ui_tests.rs
#	docs/ui-parity.md
2026-11-07 18:05:17 +01:00
74570b1f53 PR #8485: regenerate the scorecard after merging main
main added preferences since the PR's last merge, so the toolColors field now
makes it 10 of 195 settings that do nothing (was 10 of 194 on main); the
ui-parity preference row follows the scorecard.

Co-Authored-By: GyoJoong Kum <david32123kr@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 18:02:02 +01:00
David Mann f202206901 Merge origin/main into PR #8485
# Conflicts:
#	crates/engine/src/prefs.rs
#	crates/engine/src/presets/tests.rs
#	crates/ui-egui/src/prefs/prefs_ui.rs
#	crates/ui-egui/src/prefs/prefs_ui/tests.rs
#	crates/ui-egui/src/tool_memory.rs
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-07 17:07:45 +01:00
Hartmut Nörenberg 2c96b71cc4 Merge upstream/main into feat/reset-transform-smart-object-11662
`docs/ui-parity.md`'s status line conflicted: the branch and main each
prepended a clause at the head of the change list, and the branch also
carried the newer `Last updated` date. The merged line keeps main's
toolbar tool-memory clause (#3569) word for word after our Reset
Transform clause (#11662), with one `Change:` header and the later date.
2026-11-07 14:22:32 +01:00
Hartmut Nörenberg 1475708c14 fix(engine): Reset Transform requires its re-render
Review finding on this PR (#11675, discussion_r4499346688): with the warp now cleared as part of
the reset, a smart object whose stack holds a visible filter this build cannot apply took the
Free Transform path's forgiving branch - `refresh_layer` returns false for that stack,
`refresh_text` drops it on the floor, and `restore_unrendered` put the OLD cache back warped by
the relative map. The step recorded a placement at 100 % with no warp whose pixels still showed
the warp.

The step now insists on the guarded refresh the other smart-object edits use:

- `unapplied_filters` is checked before anything changes, so an unsupported Photoshop filter kept
  verbatim from a PSD names itself in the error and the document is never touched.
- `refresh_or_fail(doc, id)?` runs at the reset boundary, right after `transform_by_map` and
  before the exact map is pinned. It is a cache-warm call in the normal case (same document state
  as the render `transform_by_map` just did), and it refuses an unreadable source or a render that
  fails outright. Because `Session::edit` runs its closure on a copy and returns early on `Err`,
  a refused reset leaves the document, the placement, the warp and the history list exactly as
  they were - the fallback pixels are never accepted.

Regression test `reset_transform_refuses_a_stack_it_cannot_re_render` (red before this commit:
the reset returned Ok) asserts the error names the filter, that transform, warp and filter stack
are unchanged, that no history state was added, and that the same object resets normally once the
unsupported filter is off the stack. The four existing reset tests still pass, so the success
path and its warp clearing are unchanged.

No new dependency; photocraft_io's UNSUPPORTED_FILTER was already re-exported by this module.
2026-11-07 06:17:54 +01:00
Hartmut Nörenberg efaa011d0e docs: Reset Transform clears the warp
The ui-parity row, its revision entry and the status line said the Warp survives Reset Transform.
It does not: measured against the reference application 2026-11-06 (report in #11675), the warp is
cleared with the rest of the transform, and the object centres on the average of the placement's
four corners. A 2026-11-07 revision row records the correction; the 2026-11-06 entry stays as the
history of what landed when.

cargo xtask parity and scorecard re-run: unchanged (661 of 661 live), so nothing to regenerate.
2026-11-07 02:18:23 +01:00
David Mann 482e167e98 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 22:58:10 +01:00
Hartmut Nörenberg e5d597f6e7 Merge remote-tracking branch 'upstream/main' into feat/reset-transform-smart-object-11662
# Conflicts:
#	docs/ui-parity.md
2026-11-06 19:36:36 +01:00
Hartmut Nörenberg 4438f0075b docs: record Reset Transform parity
cargo xtask parity and cargo xtask scorecard regenerated: 661 of 661 menu items
live, Layer 162 of 162. A ui-parity row for the command and the Layers panel
row-menu item, with the revision entry and the status line (#11662).
2026-11-06 18:13:52 +01:00
Saloouu 3ed01375e5 Merge main 2026-11-06 18:13:34 +01:00
Saloouu 5393bb680e Merge main 2026-11-06 16:19:00 +01:00
David Mann e8bb14bb0f Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-06 14:05:34 +01:00
Khawar Zamman Wani 04be226762 Merge remote-tracking branch 'origin/main' into claude/selective-colours-isolation-329d87
# Conflicts:
#	docs/ui-parity.md
2026-11-06 14:39:03 +05:30
Hector VillarrealandClaude Opus 5.5 aec8579000 feat(ui): drag the zones of a Hue/Saturation colour range (#9252)
The range bar's handles moved one at a time. As in Photoshop 2025,
dragging between them moves them together: the fully-on span moves all
four, the left or right fade its own two. A side stops at the other and
the range never passes a turn. One history step per drag.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 22:53:19 -06:00
Saloouu 633201a72b Merge main 2026-11-06 04:45:27 +01:00
Khawar Zamman Wani 3bc3bec1d5 Merge remote-tracking branch 'origin/main' into claude/selective-colours-isolation-329d87
# Conflicts:
#	docs/ui-parity.md
2026-11-06 08:27:58 +05:30
David Mann 4c6d5e259a Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 02:32:59 +01:00
David Mann 8d56d89a35 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 02:29:13 +01:00
Zinadin ZidanandClaude Opus 5.5 3d60ad01f9 Channels: the panel menu has the channel commands, New Spot Channel among them (#11451) (#11557)
* Channels: the panel menu has the channel commands, New Spot Channel among them (#11451)

The Channels panel's menu had no channel items, so New Spot Channel... and
the rest could only be reached from a row's right-click menu. It now lists
New Channel..., Duplicate Channel, Delete Channel, New Spot Channel...,
Merge Spot Channel, Channel Options..., Split Channels and Merge
Channels..., each acting on the targeted channel and greyed where it can't:
Duplicate takes a single colour, alpha or spot channel, the composite of a
one-channel image, the Quick Mask or a targeted layer mask. Channel
Options... in Quick Mask mode now opens the targeted alpha or spot
channel's options, not Quick Mask Options. The panel menus run their
commands through the menu bar's enabled rules, so the Layers panel menu
greys its dialog items the same way too. The labels are in every catalog.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: New Channel... and Merge Channels... ask first, from the panel and row menus (#11451)

The panel menu's Merge Channels... ran channel.merge with no parameters, and
the engine merged the first grayscale documents into RGB and closed them with
no choice; New Channel... added a channel straight away. Both now open a
dialog when called without parameters, as New Spot Channel... and Channel
Options... already did: New Channel... reuses the Channel Options dialog
(name, colour indicates, colour and opacity), and a new Merge Channels
dialog picks the mode and the open grayscale document for each channel. The
channel rows' menu had the same two items and goes through the same path.
With parameters (scripts, the New button) both still run at once.

The Merge Spot Channel test now checks pixels, so a delete couldn't pass it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: Merge Channels waits for three grayscale documents and the dialog offers only modes they fill (#11451)

With two grayscale documents open, Merge Channels... was enabled and its
dialog repeated a document for the third channel; OK then failed in the
engine and the dialog closed. The engine's rule now needs three documents
of one size (no mode merges fewer), so the menus grey the item below that.
The dialog offers only the modes the open documents can fill (RGB and Lab
from three, CMYK from four), greys OK with the reason while the picks
repeat, keeps itself open when OK is refused, and comes back with the
engine's message if the merge itself fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: the Merge Channels dialog keeps its picks by document id (#11451)

The dialog kept the picked source documents by tab index, and background
work can still run while it is open, so a document moved or closed in the
meantime could leave another one at a picked index; OK would then merge,
and close, the wrong document. The picks are now document ids, resolved to
the current tabs when OK is pressed: a closed pick, or one that is no
longer a grayscale document of the same size, is refused with the reason
and the dialog stays open.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:20:08 +01:00
David Mann cc361c306d Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/engine/Cargo.toml
#	crates/engine/src/prefs.rs
#	docs/ui-parity.md
2026-11-06 02:16:44 +01:00
David Mann 0fb63e2f58 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-06 02:07:26 +01:00
Saloouu 75df80fe33 Merge main and regenerate the scorecard 2026-11-05 19:18:47 +01:00
Khawar Zamman Wani ac92cafdfd Keep each colour's values in the Selective Color dialog (#11463)
Image > Adjustments > Selective Color used the generic schema form: one
set of sliders shared by all nine colours, with OK applying them only to
the colour selected at that moment. Switching colour looked like the
values had spread, and edits to other colours were lost.

Make it a dedicated adjustment kind with one editor shared by the dialog
and the Properties panel. Each colour now keeps its own row, and OK and
Preview apply all nine. The older single-colour params from actions and
smart filters fold into the rows.
2026-11-05 19:15:59 +05:30
Khawar Zamman Wani e3ecd73569 feat(frame): rework the Frame tool's selection, handles and placement (#8920)
Thanks @wanikhawar — merging the Frame Tool rework.

Summary: Frame Tool selection/handles/placement now distinguish frame vs image (border / click / double-click and Layers thumbnails), with independent transforms, shape variants, Properties/options-bar stroke and fit commands, Convert to Frame, CLI/MCP `layer.frame.*` commands, native `.pcraft` persistence, and PSD export via editable groups + `pcFr` metadata (not Photoshop's native frame type). Tests cover selection, transforms, fitting, locks/hostile geometry, and native/PSD round-trips.
2026-11-05 12:39:02 +01:00