Commit Graph
3891 Commits
Author SHA1 Message Date
David MannandClaude Opus 5.5 c571f81b1c Merge main into fix/11905-bg-eraser-transparency-lock
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-11-08 23:25:35 +01:00
Sven Lafebre f5821fa581 test(engine): check the partly transparent fringe is not empty (#11995) 2026-11-08 23:07:15 +01:00
Sven Lafebre 25d6041ab5 fix(algo): partly transparent colours keep the per-channel limit (#11995)
The spread was measured on opaque colours only, and the issue keeps
today's behaviour for partly transparent ones, in the match and in the
anti-alias fringe.
2026-11-08 22:53:30 +01:00
David Mann 0523777541 Merge origin/main into fix/average-smart-filters 2026-11-08 22:24:23 +01:00
David Mann 118fc0da6b Merge remote-tracking branch 'origin/main' into HEAD 2026-11-08 22:17:36 +01:00
Sven Lafebre e0ca582b97 fix(engine): the Magic Eraser measures Tolerance by colour spread (#11995)
On 8-bit RGB a pixel now matches the clicked colour when the spread of
{0, dR, dG, dB} is within the Tolerance, so opposite changes in two
channels count double and green and blue stay at Tolerance 255. The
anti-alias fringe uses the same distance. The Magic Wand, the Paint
Bucket and other modes and depths keep the per-channel limit.
2026-11-08 22:11:51 +01:00
RickiNano cf2f496660 Format the #11887 tests 2026-11-08 22:01:12 +01:00
RickiNano 3a21e14f06 Tests that draw the smoothing catch-up turn Catch-up on Stroke End on (#11887) 2026-11-08 22:01:12 +01:00
David Mann dff5d29584 Merge remote-tracking branch 'origin/main' into fix/12397-wand-seed-tests-antialias 2026-11-08 21:03:43 +01:00
David MannandClaude Opus 5.5 bfe5d2a671 Magic Wand seed-outside tests: keep Anti-alias on, expect the measured fringe (#12397)
Instead of turning Anti-alias off, the tests keep the default setup and
expect the reference application's measured results (#11776, #11779):
the selection ends at 381, Subtract at 219, Intersect runs 219-381.
Suggested by hectorviov on #12399.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 21:03:37 +01:00
David MannandClaude Opus 5.5 4e43c23e43 Magic Wand seed-outside tests: Anti-alias off, so they test the modes with hard edges (#12397)
#12146 gives near-matching neighbours a soft fringe when Anti-alias is on.
The #11848 tests left Anti-alias at its default and expected exact column
bounds, so main's engine tests failed (381 instead of 380).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 20:31:42 +01:00
David Mann a879c6ac0a Merge main into #10569
# Conflicts:
#	crates/ui-egui/src/menu_catalog.rs
2026-11-08 20:20:12 +01:00
Hector Villarreal 3f76716b98 Merge main into fix/color-replacement-tolerance-field (conflict in crates/engine/src/cmd/brush_cmds.rs, as asked on the PR) 2026-11-08 13:19:05 -06:00
David Mann a17acfa7a7 Merge pull request #12049 from DuBearte/fix/11897-clear-on-background
Brush: Clear on the Background paints as Normal and the Mode reads Normal
2026-11-08 20:16:11 +01:00
David Mann 3ef886c2e0 Merge pull request #12382 from TrevorBrown-dev/fix/layer-via-copy-capital-12357
Menus: Layer Via Copy and Layer Via Cut with a capital V, as in the reference (#12357)
2026-11-08 20:10:52 +01:00
Hector Villarreal 091f8a2666 Merge main into fix/note-clear-all-confirm (conflict in crates/ui-egui/src/tools/analysis_ui.rs, as asked on the PR) 2026-11-08 12:59:27 -06:00
David Mann 8acd45bfa9 Merge pull request #12298 from TrevorBrown-dev/fix/patch-destination-selection-12119
Patch: in Destination mode the selection moves with the patch (#12119)
2026-11-08 19:56:56 +01:00
David Mann 83e2172336 Merge pull request #11848 from DuBearte/fix/11779-wand-seed-outside
fix(engine): Magic Wand Subtract and Intersect grow from the seed through the selection (#11779)
2026-11-08 19:33:29 +01:00
David Mann fa41efebc5 Merge pull request #9348 from VoiceLessQ/pattern-preview-wrap-tools
paint: 12 more painting tools wrap across the canvas edges in Pattern Preview (#8883)
2026-11-08 19:22:34 +01:00
David MannandClaude Opus 5.5 3d2667d0e6 Background Eraser: channel-target preview mixes back unlocked like its commit (#12191)
On a transparency-locked layer with a colour-channel target, the live
preview mixed the dabs back with the lock (straight mix) while the commit
mixes premultiplied without it, so at 32 bits partly transparent pixels
rounded differently in the preview. The channel branch now builds the
LiveDab unlocked and pushes the points afterwards, as the RGB branch does.
The test now runs at 8, 16 and 32 bits over a half-transparent strip at
half opacity; it failed at 32 bits before the fix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 19:12:17 +01:00
8535cfb7e6 test(engine): exact labels for every Record Measurements source (#11853)
The review on #11853 noted that the tests checked only that a selection
row's label did not start with "Count", never tested `auto` choosing a
selection, never tested a ruler row, and read only the first row. Now
each record must give exactly one row, the selection and ruler rows must
be "Measurement N", `auto` with a selection must stay "Measurement N",
and the shared counter is checked across all three sources.

Co-Authored-By: DuBearte <DuBearte@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 19:03:58 +01:00
David Mann d351491e93 Merge remote-tracking branch 'origin/main' into pr-12191 2026-11-08 19:03:22 +01:00
David Mann 55498d45ba Merge remote-tracking branch 'origin/main' into pr-9077
# Conflicts:
#	docs/gaps.md
2026-11-08 18:55:24 +01:00
David Mann 5a194128b1 Merge remote-tracking branch 'origin/main' into pr-11853
# Conflicts:
#	crates/engine/src/cmd.rs
2026-11-08 18:53:37 +01:00
Trevor BrownandClaude Sonnet 5.5 76ad52bf47 Patch Destination: the rectangle check is capped and scans in bands (#12119)
Cause: is_hard_rect read selection coverage over the selection's own content bounds in one buffer. After a transform those bounds can reach far past the canvas, while the patch-size guard only measures the on-canvas part, so a huge mostly-off-canvas selection could stall or exhaust memory.

Fix: is_hard_rect now calls is_hard_rect_within with MAX_PIXELS (the patch's own cap); bounds over the cap are not a hard rectangle and the selection stays in place. Otherwise coverage is scanned in 64-row bands, stopping at the first pixel below 1.0.

Verified: new test covers a limit below and at the pixel count and a hole in the third band; patch (25) and retouch (126) lib tests pass, clippy -D warnings and fmt clean.

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 12:38:04 -05:00
b5501b9bd1 PR #12049: keep a held ~ erasing on the Background, keep Clear on a locked one
The engine turned every "mode": "clear" stroke on the Background into
Normal, so a held ~ painted the foreground there instead of erasing to
the background colour as on main. The options bar already turns a chosen
Clear off at the press, so the engine conversion was not needed: drop it
and keep the one check in clear_off_on_background.

A Background with locked pixels refuses the stroke, so a chosen Clear now
stays chosen there. The "Tool state machine" doc line is back on
tool_event.

Co-Authored-By: DuBearte <DuBearte@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 18:20:55 +01:00
David Mann bb7a1289b0 Merge remote-tracking branch 'origin/main' into pr-12049 2026-11-08 18:05:36 +01:00
David MannandClaude Opus 5.5 62c5d6283c Copy CSS: groups, fill layers and point type as the reference application writes them
Measured in the reference application:
- A group writes its box (the canvas) and z-index, then the rule of each
  layer in it, top first, with no blank line between rules. A group's end
  takes a place in the stack, so z-index counts it.
- A Solid Color fill layer without a shape greys Copy CSS out; so does a
  selection with no layer that has CSS.
- Point type is placed by its line box: left is the pixel left less the
  ink's offset from the origin; top centres the line box on the pixels, or
  on half the cap height above the baseline when the text has a
  descender. Left and top are cut after three decimals, not rounded.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 17:34:32 +01:00
David Mann 532421aa2a Merge pull request #12212 from TrevorBrown-dev/feat/open-as-smart-object-11678
File: Open as Smart Object... opens a file as a new document holding one embedded smart object (#11678)
2026-11-08 16:59:25 +01:00
David Mann 8c94ba8a15 Merge pull request #12203 from hectorviov/fix/count-history-names
Count tool: History names Add/Drag/Delete Count Object, Add Count Group and one name per group setting (#11763)
2026-11-08 16:58:51 +01:00
David Mann 89660c82fe Merge pull request #12231 from hectorviov/fix/note-stored-values
Notes: new notes store the reference application's colour, popup rectangle and local-time date
2026-11-08 16:57:08 +01:00
David Mann b0953546ca Merge pull request #12148 from hnoerenberg/fix/straighten-layer-states-12033
fix(engine): Straighten Layer greys out and refuses the states the reference does
2026-11-08 16:56:18 +01:00
David Mann 45c76d5c5c Merge pull request #12144 from hnoerenberg/fix/indexed-type-selection-12041
fix(engine): the Type tool leaves a selection in Indexed Color
2026-11-08 16:56:00 +01:00
David Mann 32ce08364b Merge pull request #9991 from ljkx/feat/raw-xmp-crop
Camera Raw sidecars: apply the crop, stop reporting RawFileName (#9985)
2026-11-08 16:55:43 +01:00
David Mann 367c518145 Merge remote-tracking branch 'origin/main' into pr-10059 2026-11-08 16:28:39 +01:00
Trevor BrownandClaude Sonnet 5.5 66d5ebed89 Menus: Layer Via Copy and Layer Via Cut with a capital V, as in the reference (#12357)
Cause: the menu bar, the command labels and the selection tools' canvas menu spelled the two commands "Layer via Copy" and "Layer via Cut", while the reference application (and PhotoCraft's own History names and ATN event table) use a capital V.

Fix: renamed the labels in crates/ui-egui/src/menu_catalog.rs, the two spec! labels in crates/engine/src/cmd/edit_cmds.rs, and the rows in crates/ui-egui/src/canvas/canvas_tool_menu.rs with its test assertions. In the 33 locale files crates/ui-egui/src/i18n/*.tsv that carry the keys, only the key column of those two rows changed (66 rows), so every translation is kept and no language falls back to English. New tests are in crates/ui-egui/src/layer_via_label_tests.rs, registered with one mod line in lib.rs like the other *_tests.rs files.

Verified: the 5 new tests pass; canvas_tool_menu 51 passed; engine edit_cmds 112 passed; i18n 66 passed and 8 live_tests failed with the known local font panic in epaint fonts.rs (font-dependent, green on CI); cargo xtask parity left docs/parity-checklist.md unchanged; clippy -D warnings and fmt are clean. TSV check against HEAD: 34 files, same row count in each, exactly 66 rows differ (2 per file in 33 files, Hindi has none), only the key column of those rows differs, the translation column is byte-identical, no old key remains, and no CR bytes in any touched file.

Not changed: the translations' text, the History names and the ATN event table (already the capital V), docs/ui-parity.md and the other parity docs.

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 10:14:55 -05:00
ac6822c7d6 Color Lookup: the Image > Adjustments dialog's defaults run again (#9827)
Since the embedded-LUT params were added, the generated Color Lookup dialog
filled `fileName` with 0 (the dialog has no kind for `text?`), `data` with ""
and `lutFormat` with "cube". Every OK failed, and a .3dl or .look file from
the LUT folder (#9754) would have been parsed as .cube. `fileName` is now
plain text, `lutFormat` gets an `auto` default (detect from the file), and
an empty `data` / `fileName` counts as not given, like an empty `file`.

Also puts the Lens Blur test's doc comment back on its test (a merge had
moved it onto the LUT folder test).

Co-Authored-By: Luis-0508 <43929895+Luis-0508@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 16:05:10 +01:00
Trevor BrownandClaude Opus 5.5 1483d5193d Merge upstream/main into fix/patch-destination-selection-12119
Conflict in retouch_cmds/patch.rs with #12255 (one History name, "Patch Selection", for every mode): kept the Destination branch that moves a hard rectangular selection with the patch and gave it HISTORY_NAME, and restored Plan's destination flag, which #12255 had removed as unused. patch tests 24 passed (including #12255's history-name test), clippy and fmt clean.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Model-Effort: Opus 5.5 drove and resolved
2026-11-08 09:51:27 -05:00
David Mann eaaa84b04b Merge remote-tracking branch 'origin/main' into fix/11905-bg-eraser-transparency-lock 2026-11-08 15:49:56 +01:00
David MannandClaude Opus 5.5 fcba4c875b Background Eraser: pin preview = commit for a channel target on a locked layer; LiveDab::unlocked usage
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 15:49:52 +01:00
Trevor BrownandClaude Sonnet 5.5 f3de619549 Patch Destination: a hard rectangle partly off the canvas moves with the patch (#12119)
Cause: is_hard_rect required the selection's bounds to equal plan.area, which is clipped to the canvas. A hard rectangle reaching past the canvas (e.g. moved there with select.transformSelection, which keeps the off-canvas pixels) has bounds larger than the area, so the pixels were patched but the selection was left behind.

Fix: treat the selection as a hard rectangle when nothing is selected outside its own bounds and every pixel inside those bounds is fully selected, then translate the whole selection by the drag offset. Feathered, non-rectangular and holed selections still stay in place.

Verified: new test destination_moves_a_hard_rectangle_that_extends_past_the_canvas failed before the change (selection stayed at -20,100..40,140 while the pixels changed) and passes after, including one-undo restore of pixels and selection. cargo test -p photocraft-engine --lib patch (19 passed) and retouch (120 passed), clippy -D warnings and fmt clean.

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 09:47:11 -05:00
David Mann 848fa306f5 Merge pull request #12255 from SBaksa/patch-history-names
Patch: History names as the tool's (fixes #12117)
2026-11-08 15:25:52 +01:00
David Mann 7acc08cbb9 Merge pull request #12306 from hectorviov/fix/mixer-indexed-bitmap
Mixer Brush: refuse Indexed Color and Bitmap documents with the alert (#11958)
2026-11-08 15:09:44 +01:00
0c6b564536 Magic Wand: skip the selection mask when Contiguous is off; more tests (#11848)
PR #11848 built the full-area selection mask for every Subtract and
Intersect click, though the global match (Contiguous off) ignores it.
Build it only when the fill is contiguous.

Tests for the review: Contiguous off keeps the global match, Subtract and
Intersect without a selection select nothing, the row check fails on a hole
in the selected run, and the fill's half-selected threshold (0.49 vs 0.5)
at the seed and at the fill's edge.

Co-Authored-By: DuBearte <130190089+DuBearte@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 15:04:43 +01:00
David Mann 7d8c18c34e Merge pull request #12265 from hectorviov/fix/color-replacement-refuses-modes
Color Replacement: refuse RGB/32, Grayscale, Bitmap and Indexed documents
2026-11-08 14:56:43 +01:00
David Mann e5decd0b85 Merge remote-tracking branch 'origin/main' into pr-11848 2026-11-08 14:54:13 +01:00
Trevor BrownandClaude Sonnet 5.5 fec4980c7b Patch Destination: clone only the selection; guard, error path and redo tests (#12119)
The Destination branch of the Patch command no longer clones the whole document: it takes only the selection before the target surface borrows the document, and computes the selection's content bounds once, passing them to `is_hard_rect` and reusing them for the translate. Behaviour is unchanged.

Tests are split and extended: Destination with a feathered, ellipse, lasso and holed-rectangle selection leaves the selection in place while the patch still lands; Destination with no selection fails, adds no history entry and a following undo reverts the previous step, not the setup; redo restores both the patched pixels and the moved selection; Source and Content-Aware are separate tests, the latter asserting a pixel change; the main test also asserts source pixels unchanged, the destination carrying the source texture, the moved selection still hard-edged, and the returned damage and offset. A rectangle larger than the patched area and a partly covering selection without a hole cannot be built, because the patched area is the selection's own content bounds; an inverted selection makes the area the whole canvas, which Patch refuses.

Verified: `cargo test -p photocraft-engine --lib patch` 18 passed; `--lib retouch` 119 passed; clippy `--all-targets -D warnings` clean; `cargo fmt -p photocraft-engine` clean.

Not changed: the coverage pass in `is_hard_rect` (one pass over the patched area per command, the same order of work as the patch itself).

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 08:44:18 -05:00
David Mann dada110838 Merge pull request #12263 from hectorviov/fix/color-replacement-history-name
Color Replacement: History names each edit "Color Replacement Tool"
2026-11-08 14:35:37 +01:00
SBaksa 28d2d9095d History and plug-in names: trim the fillers and blank padding at the ends too
trim_name drops white space, ZWNJ/ZWJ and the blank characters (Braille blank, Hangul fillers,
invisible operators, tag and other default-ignorable blanks) from both ends. A variation or
Mongolian free variation selector or CGJ that belongs to a kept character stays, and so do Hangul
filler jamo that complete a syllable. History names use the same trim as plug-in names.
2026-11-08 22:40:53 +11:00
yoriswind d6b1bb7c45 Merge current main and scope Move marquee selection 2026-11-08 03:37:42 -08:00