Commit Graph
3891 Commits
Author SHA1 Message Date
Hector VillarrealandClaude Opus 5.5 0e421d6a33 Replace Color: Add to Sample and Subtract from Sample (#6280)
Replace Color had one eyedropper and matched one colour. As in Photoshop, its
dialog now has the Eyedropper, Add to Sample and Subtract from Sample tools
(Shift-click adds, Alt-click subtracts), and image.adjustments.replaceColor
takes several points, subtractPoints and their click order. Several samples
match through Select › Color Range's own matcher, so the two agree for the
same clicks; a single colour keeps the existing path.

Fixes #6280

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 21:14:59 -06:00
dotCooCoo 8fe24e4a62 Merge main into feat/equalize-entire-image 2026-11-05 19:13:39 -08:00
David MannandClaude Opus 5.5 99b93f82da Batch 18 (CodeRabbit nitpicks): crop test checks the active layer's covered pixels; Esc test goes through the shortcut handler
- #11458: the straight-crop rows also check that the active layer's pixels
  inside the old canvas are the plain crop's, so a fill that recolours them
  fails.
- #11295: the Esc case sends the key through shortcuts::handle instead of
  calling cancel directly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 04:04:26 +01:00
yoriswind d58701ddff Merge current main into the Actions preservation candidate 2026-11-05 18:31:30 -08:00
yoriswind 994443c310 Preserve Actions menu ownership controls 2026-11-05 18:23:19 -08:00
David Mann 5d10956221 Merge pull request #9261 from davidmann4/fix/image-size-resolution-range
Image Size: refuse a resolution outside 1..30000 ppi instead of clamping it (#9260)
2026-11-06 03:16:20 +01:00
David Mann 7122a21fec Merge pull request #9670 from davidmann4/fix/svg-markup-check
SVG: a DTD entity can't hide nesting from the depth check (#9669)
2026-11-06 03:15:57 +01:00
David Mann 03f9f53b13 Merge pull request #9213 from davidmann4/fix/crop-hidden-resample-budget
Crop W x H budgets the hidden pixels it resamples (#9212)
2026-11-06 03:15:14 +01:00
dotCooCoo 9ffbca0e5c Merge main into feat/equalize-entire-image 2026-11-05 18:04:02 -08:00
David MannandClaude Opus 5.5 8f7815adc5 Batch 18 (#11295): the shape box names its own step when the transform lands as a job
In the app (background jobs on) edit.transform runs as a job and lands
after app.run returns, so renaming the top History step to "Transform
Path" right away renamed the step before it (the second shape's "New
Shape Layer") and left the scale as "Free Transform". Found in the batch
smoke run; the PR's tests run with background jobs off.

edit.transform now takes stepName "Transform Path" (any other name is
refused, as select.transformSelection's stepName from #11444), and the box
passes it instead of renaming afterwards. New tests: the box with
background jobs on (fails without the fix), and the parameter.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 03:01:30 +01:00
yoriswind 58b0265f18 Format the five-command Actions repair 2026-11-05 17:47:05 -08:00
Trevor BrownandClaude Fable 5.1 1855419220 Merge upstream/main into feat/artboard-options-bar-11385
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-05 20:41:18 -05:00
David Mann 4c6d5e259a Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 02:32:59 +01:00
yoriswind 35db7b1e67 Merge current Channels panel changes into the Actions repair 2026-11-05 17:30:21 -08: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 3af79c0cb7 Merge main 9b02eac2c4 into integration batch 18 2026-11-06 02:14:46 +01:00
Hector VillarrealandClaude Opus 5.5 e4f2069b1b Paths: ⇧⌥⌘↩ intersects the path with the selection (#7726)
Main already has Add Path to Selection (⇧⌘↩) and Subtract Path from
Selection (⌥⌘↩) as engine commands (#8015). This adds the third,
path.intersectWithSelection (Cmd+Alt+Shift+Enter), next to them:
path.toSelection with mode "intersect", loading the path selected in
the Paths panel (or the one being drawn) from the UI as the other two do.

Tests: an engine test that the three fixed-mode commands match
path.toSelection with their mode whatever mode the params ask for, and
a UI test pressing ⇧⌘↩, ⌥⌘↩, ⇧⌥⌘↩ and ⌘↩ through the egui input, with
Photoshop 2025's areas for the same document (7200, 5200, 800, 2000 px).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 19:13:59 -06:00
yoriswind 84c41c5f10 Limit Actions panel changes to the five reviewed commands 2026-11-05 17:13:15 -08: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
David MannandClaude Opus 5.5 88704d2350 Merge fix-up: the turned crop's hidden pixels after Layer 0 replaces the Background
Since #10867 the non-deleting crop turns a 2000 px layer to 2001 px bounds, so
the budget refusal names 200100 x 200100 px.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:06:41 +01:00
David Mann 4b61c8ef34 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/algo/src/resample/tests.rs
2026-11-06 01:58:38 +01:00
David Mann dabf3bab97 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/scorecard.md
2026-11-06 01:54:36 +01:00
David Mann d563b3100b Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/engine/tests/it/svg_smart_object.rs
2026-11-06 01:46:48 +01:00
David MannandClaude Opus 5.5 0e1cdc45cb Address review: #[must_use] on fit_canvas; Duplicate follows the shift too
fit_canvas's (i32, i32) shift is now #[must_use], so a caller can't drop it
and leave the Color Sampler points and painting symmetry behind. That
flagged the last caller that still dropped it: Layer > Duplicate on a board
(place_copy, single and several layers). place_copy now returns the shift and
both duplicate paths pass it to follow_shift. It is non-zero when another
board was already past the origin, as an imported PSD can hold.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:39:48 +01:00
David Mann b1bd2da9d7 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/layer_copy_cmds.rs
2026-11-06 01:33:39 +01:00
David Mann 9bef3b2dc8 Merge pull request #6088 from davidmann4/fix/snapshot-followups
History snapshots: follow-ups to #3567 (#6087)
2026-11-06 01:32:54 +01:00
David Mann 3d5ee644dc Merge origin/main
# Conflicts:
#	crates/engine/src/cmd/artboard_cmds.rs
#	crates/engine/src/cmd/layer_multi_cmds/moves.rs
2026-11-06 01:30:27 +01:00
David MannandClaude Opus 5.5 608cedc5eb Address review: keep scaled pattern scales within 1..1000 %
scale_effects (Image Size's Scale Styles, Layer Style > Scale Effects, the
Free Transform style preview) now clamps the Pattern Overlay, Bevel & Emboss
Texture and pattern Stroke scales to the 1..1000 % the Layer Style dialog
allows, through one shared photocraft_doc::effects::PATTERN_SCALE_RANGE that
the layer style param parser now uses too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:24:20 +01:00
David MannandClaude Opus 5.5 2037705698 Address review: pin crop's 0 origin, numeric strings, partly-outside rect and Reveal All
x/y of 0 count as given, numeric strings are refused on every side, a
rectangle partly past the canvas grows it as passed, and Reveal All
(crop_keeping_background) still crops to all four sides with a selection
active.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:21:45 +01:00
David Mann 35bffe6e4e Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/image_cmds.rs
2026-11-06 01:21:45 +01:00
David Mann 945fec8665 Merge remote-tracking branch 'origin/main' into HEAD 2026-11-06 01:07:30 +01:00
David MannandClaude Opus 5.5 6e42bc901e Batch 18 (#11458): a guarded label lookup in the Content-Aware crop donor check
The donor check indexed the label buffer directly; the bounds are inside
the canvas today, but a lookup that is out of range now counts as no donor
instead of panicking.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:53:47 +01:00
ArjenS-LA a38fc6ff5b Refresh Average Smart Filter stack and verify selection and channel values 2026-11-05 15:53:24 -08:00
ArjenS-LA 19b5ef0fb3 Merge current main and strengthen Average selection regression 2026-11-05 15:52:30 -08:00
midasdf eafaf5cc5d Merge remote-tracking branch 'origin/main' into jp/print-paper-sizes
# Conflicts:
#	docs/target-app-parity.md
2026-11-06 08:51:40 +09:00
e59dcc9c44 GPU plan: cache adjustment LUT rows between plans (#11498) (#11539)
* GPU plan: cache adjustment LUT rows between plans (#11498)

adjustment_program rebuilt the Levels/Curves tone tables on every plan
(twice per refresh), about 1-2 ms per Levels layer each time. Keep the
rows of Levels, Curves, Color Balance and Hue/Saturation ranges in a
32-entry most-recently-used cache (photocraft_compose::lut_rows, at
most 32 x 3 x 16 KiB = 1.5 MiB), built outside the lock.

Entries are keyed by a u64 hash of exactly what each row builder reads,
fields destructured in full and floats by bits (-0.0 and 0.0 stay
apart). Hue/Saturation master sliders don't add entries; Hue/Sat ranges
and Color Balance don't depend on depth. Edit > Purge > All drops the
cache, and a filled cache enables it.

Release, per call: Levels 8/16-bit 1.10 -> 0.003-0.018 ms, Curves
0.16 -> 0.018, Color Balance 0.11 -> 0.001-0.015, Hue/Sat ranges
0.05 -> 0.008-0.018. The tables are identical, so rendering is unchanged.

Tests: cached rows match fresh tables bit for bit at 8/16/32-bit, hits
and LRU eviction on a local cache, key coverage, and Purge All
releasing the cache.

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

* compose: rustfmt the LUT row cache tests (#11498)

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

* GPU plan: test that plans read cached LUT rows and that curve points key them (#11498)

Plant rows no builder makes under a fresh key and check the planner returns
them, and check that moving a Curves point changes its key (review on #11539).

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

* compose: prevent in-flight LUT builds from undoing purge

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: FredApps <FredApps@users.noreply.github.com>
2026-11-06 00:32:49 +01:00
David Mann 09e44e022c Merge PR #11497: Menus: View › Guides submenu in the reference's order, with Edit Selected Guides and Clear Selected Guides (#11400)
# Conflicts:
#	crates/ui-egui/src/lib.rs
#	docs/parity-checklist.md
#	docs/scorecard.md
2026-11-06 00:29:28 +01:00
David Mann d43d1c6d0a Merge PR #11443: Move tool: History names its steps Move, Nudge and Duplicate as the reference does (#11383)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:07 +01:00
David Mann e932db7c69 Merge PR #11494: Menus: Edit › Preferences says Plugins… and Camera Raw… and has the reference's separators (#11398)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:01 +01:00
David Mann 1d053f5c2c Merge PR #11495: Actions: play recorded Stack Modes and Video Frame events 2026-11-06 00:28:47 +01:00
David Mann 1d5c69dda4 Merge PR #11458: Crop: fill the active layer and Background with Content-Aware Fill 2026-11-06 00:28:41 +01:00
David Mann f96e77e794 Merge PR #11553: Actions: replay recorded Perspective Warp steps 2026-11-06 00:28:38 +01:00
David Mann a77d7d6b53 Merge PR #11503: Layer > Smart Objects says Reveal in Explorer, Embed Linked and Embed All Linked, in the reference order, without the Warp rows (#11401) 2026-11-06 00:28:25 +01:00
David Mann c581cd57c2 Merge PR #11455: Menus: Combine Shapes, Open Recent, Arrange and Proof Setup items carry the reference's names (#11399) 2026-11-06 00:28:19 +01:00
David Mann be08f07614 Merge PR #11453: Polygonal Lasso: History step "Polygonal Lasso" and Shift diagonals snap to the shorter offset (#11393) 2026-11-06 00:28:16 +01:00
David Mann d6d14dea8f Merge PR #11496: Artboard tool: the first board drawn in a document takes the Background in as "Layer 0" (#11387) 2026-11-06 00:28:10 +01:00
David Mann 45c797b85b Merge PR #11521: Shift+letter cycles a tool group in toolbar order and the anchor point tools no longer take the letter P (#11376) 2026-11-06 00:28:07 +01:00
David Mann fd69404ea5 Merge PR #11535: The healing slot starts on Spot Healing Brush and the brush slot lists Color Replacement before Mixer Brush (#11375) 2026-11-06 00:28:04 +01:00