Commit Graph
3891 Commits
Author SHA1 Message Date
Korg1ch 3c7ee9eded fix(engine): Displace on a Smart Object embeds its map in the smart filter, as Photoshop does (#7423) 2026-10-21 18:23:45 +03:00
Michael Higgins 76d7d27c52 Merge branch 'storytold:main' into fix/5647-shift-tool-switch-migration 2026-10-21 11:22:18 -04:00
Michael Higgins 968d8db4e1 Merge branch 'storytold:main' into fix/7524-plugin-preview-px-scale 2026-10-21 11:22:01 -04:00
Michael Higgins f6dcb0beaf Merge branch 'storytold:main' into fix/8060-crop-reveals-hidden-pixels 2026-10-21 11:21:41 -04:00
Michael Higgins 3ae0678678 Merge branch 'storytold:main' into fix/5745-auto-blend 2026-10-21 11:21:07 -04:00
David MannandClaude Opus 5.5 83b3087914 Keyboard Shortcuts: the dialog switches sets through the engine too (#8286)
The dialog's Set dropdown replaced its bindings with the set's copy and
computed "(modified)" itself, so it still dropped the actions' F-keys and
marked a set modified when one was assigned. It now uses the engine's
ShortcutSet::apply (what useSet does), shortcut_sets::differs (what the
engine's `modified` uses) and ShortcutSet::from_bindings for Save and
New Set. Sets sent with `sets` (the dialog's OK) hold no action keys
either, and an action key a set saved earlier still holds doesn't count
as a change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 17:20:55 +02:00
Branch Sync 133ea2b1ec Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:46 -04:00
Branch Sync 25634c1794 Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:33 -04:00
Branch Sync d08a16507c Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:17 -04:00
Branch Sync 24970b1622 Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:07 -04:00
Branch Sync f5161d9cb1 Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:17:49 -04:00
Branch Sync 0750751261 Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:17:17 -04:00
Branch Sync f343abda5d Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:15:43 -04:00
Jason White 6fdbed2348 fix(atn): keep a Save with a destination but no format
A recorded Save with an In path and no As format was still imported as a
Save As going by the file extension alone. Without the format there's
nothing to check the destination against, so keep it as a Photoshop step
and let playback stop there.
2026-10-21 16:11:11 +01:00
Jason White 81b917a6b8 fix(atn): don't read an odd Save As format as a plain Save
If a recorded Save had an As field that wasn't a descriptor, it got
treated like no format at all. With no destination that imported as a
plain File > Save, which saves over the open file, and with one it went
through as a Save As without checking the format. Both stay kept steps
now so playback stops there.
2026-10-21 16:11:11 +01:00
Jason White 5f0b8cb51c fix(atn): write WebP saves with Photoshop's built-in WebP class
Photoshop 2026 rejects the old WebPShop plug-in class and saves a PSD
instead. WebPFormat is what it uses now, the plug-in classes still import.
2026-10-21 16:11:11 +01:00
Jason White 0cc7bba44c fix(atn): import a recorded Save As with its destination (#7102)
The save event was mapped with no fields, so every Save As in an .atn
came in as a plain File > Save. Playing it wrote over the file the action
was played on and never wrote the recorded output.

Save now reads As, In and Cpy. A destination that's a file of the
recorded format imports as file.saveAs, or file.saveACopy for As a Copy.
A folder destination, an unknown format or an extension that doesn't
match stays a kept Photoshop step, so playback stops before writing
anything. Folder saves can map once the {folder, extension} step from
Save As steps now export to .atn too instead of being skipped.
2026-10-21 16:11:11 +01:00
Michael Higgins da307f8f17 Merge branch 'storytold:main' into fix/auto-blend-background-mask 2026-10-21 11:09:47 -04:00
IbrahimOezhanandClaude Opus 5.5 c0492f2303 Document the Export Preferences, Image Assets and preference-label helpers
export_preferences, image_assets and humanize had no doc comments; the review's docstring
check counts them as functions this change touches.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 15:53:54 +02:00
Korg1ch c3a99fc8fd test(ui): the Fade dialog previews the faded layer without a step (#8230) 2026-10-21 16:48:55 +03:00
FartmanAndBurps a0c6af075c docs(print): explain interactive positioning coordinates and safeguards 2026-10-21 14:36:49 +01:00
dotCooCoo 54788d006e Print: file.printers lists no stand-in printers in the browser
In the browser file.printers lists no printers and answers with a note,
but with a printer_source installed it listed the stand-in's printers.
The stand-in now follows the platform there too: file.printers and the
Print dialog's system Printer menu use it everywhere but the browser.
2026-10-21 06:36:15 -07:00
David MannandClaude Opus 5.5 b52f023191 Address CodeRabbit review: rollback brings back states the limit dropped for the step
In non-linear history a record moves the later states onto the undo side and trims to the
History States limit (and the byte budget) at once. A compound command whose later part failed
then could not take its first step back when the trim dropped the state it replaced: the
fallback Undo landed on the last later state and cleared the rest. Even when that state survived,
the oldest states were lost. The latest record now holds the states it evicted until the next
change to the list, and History::rollback puts them back.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 15:27:23 +02:00
Roberto Moura 8352b26c1a Fix lag when dragging a floating selection with the Move tool
- Replace whole-region Vec<f32> read_region/write_region in CutParts::new
  with tile-parallel cut_piece + try_fill_surface/try_clear_surface,
  sharing interior Arc<Tile> allocations in O(1) and activating the
  solid_tile hole-fill fast path on Background and mask targets.
- Cache piece_bounds on CutParts so CutParts::place avoids scanning tile
  content bounds on every drag frame.
- Parallelize composite_over across top tiles with Rayon and share fully
  opaque top tiles by Arc<Tile> clone in O(1), preserving COW tile
  identity for GPU canvas uploads.
- Parallelize Surface::translated across target tiles with Rayon and
  prune cleared tiles in-place inside edit_tiles.
- Skip zero-offset floating preview generation on pointer-down in
  move_ui::floating_doc.
- Exclude SnapKind::Selection when moving selected pixels with the Move
  tool so small initial drags do not snap back to (0, 0).
- Keep navigator_plain active during Move/Brush/Patch drags on a GPU
  canvas so navigator_gpu is not evicted into a synchronous full-document
  CPU thumbnail composite on the first drag frame.
- Parallelize row normalization in compose::render_reduced_in_bands and
  add a direct read_rgba_into fast path for unmasked Normal layers over
  an empty backdrop.
2026-10-21 13:21:10 +00:00
Korg1ch 558217792e fix(ui): live preview in the Fade dialog (#8230)
Edit > Fade opens with a Preview checkbox, as in Photoshop, and the canvas shows the layer faded with the dialog's opacity and mode. Fade blends against the state before the last step, which only the session's history holds, so the preview comes from a new engine helper, edit_menu_cmds::fade_preview, that runs the same blend on a copy of the document without a history step; fade() now shares its setup and blend with it.
2026-10-21 16:19:33 +03:00
IbrahimOezhanandClaude Opus 5.5 68577e42e1 Image Assets: optionally keep a transparent artboard's full size
File › Generate › Image Assets trims every asset to its visible pixels, artboards included. An
opaque board background hides this, but a transparent artboard whose contents don't fill it came
out cropped to the contents, losing their placement and padding on the board.

Export Preferences › Image Assets: Keep Full Artboard Size (export.imageAssetsFullArtboards, off
by default so existing asset sizes don't change) exports such an artboard at the board's size,
transparent edges included, as File › Export › Artboards to Files does. Layers on the board are
still trimmed. file.export.exportPreferences takes the new key; the label is translated in every
complete catalog; docs/scorecard.md regenerated (171 preferences).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 15:18:48 +02:00
Aditya VishwakarmaandClaude Opus 5.5 1c2ed13dd3 fix(engine): Remove Background looks for the subject in the layer, not the canvas (#8235)
On a pixel layer that doesn't fill the canvas (a placed photo, or the
canvas grown), Select Subject ran over the whole canvas, so the photo's
rectangle stood out from the empty canvas around it as the subject. The
mask then revealed the rectangle, which a Stroke layer style outlines.
Search and refine the edge within the layer's own pixels instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 18:13:08 +05:30
jonathanwxh-cellandClaude Opus 5.5 171f612337 Keep Batch results when the action saves and then closes the document
Batch dropped recorded Save / Save As / Save a Copy steps and saved the
active document after the whole action, so "..., Save As, Close" failed on
every file, and a Close that left another document active saved that one
instead. Treat a recorded save as marking the result (Photoshop's "Override
Action 'Save As' Commands"): write the document as the save found it when it
is closed or another document is active at the end, else save it after the
action as before (#3058). Droplets keep the save steps too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 20:38:27 +08:00
9a6b3cb3bc Integration: merge main, resolve conflicts with #6913's split warps (#5769)
Main's quiltWarp support (#6913) rewrote the same placed-warp code the
cylinder warp touches. Kept main's split-warp read and write
(warp_head, quiltWarp, sold_warp) and added the cylinder to it:
warp_head writes `warpValues` for a cylinder, placed_frame frames a
cylinder's mesh as well as any valid custom mesh, quad_points uses
perspective_frame of the warp the block stores, and parse_smart_perspective
reads `quiltWarp` before `warp`, as parse_placed_warp does, so a projective
placement is framed by the warp that is imported.

Co-authored-by: alvarohn <32224796+alvarohn@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 14:29:59 +02:00
4decb8dd30 Address CodeRabbit review: .act vs .aco by content, strict corpus walks (#5407, #4496)
- swatches.import with bytes only (no path or format): an .act whose first
  colour is 0, 1, x or 0, 2, x still went to the .aco reader, which ignores
  trailing bytes and returned a handful of junk swatches. At the two .act
  lengths (768/772) an .aco header now counts only when its sections span
  the whole file (new `aco::sections_len`); a Photoshop .aco of exactly
  768 bytes is still an .aco. Test: act_that_starts_like_an_aco_is_still_an_act.
- The .atn corpus tests (psd and engine) skipped unreadable folders and
  entries silently; they now fail with the path.
- act::write doc: the trailer is written when `count` or `transparent` is given.

Co-authored-by: Abdul karim mia <97598943+abdul-karim-mia@users.noreply.github.com>
Co-authored-by: Fabio Lissi <fabio.lissi@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 14:06:56 +02:00
Higgs32584andClaude Opus 5.5 65f38bf3ed Plug-ins: scale "unit": "px" params on a reduced live preview (#7524)
A filter plug-in's live preview runs on a reduced copy of a large
document, but its params only went through the built-in name list, so a
pixel length with another name (Chromatic Aberration's Amount) previewed
2-4 times too large, and a unitless `size` or `radius` was divided.

number and int params now take an optional "unit" ("px" or "none", the
default; anything else is a manifest error). The preview divides px
params by the reduction (defaults included, ints rounded, kept in range)
and limits the factor so a px param with a positive minimum never drops
below it. Unitless params are never scaled.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 08:00:57 -04:00
David Mann aa8a4dc041 Merge commit 'e63eb82ce' into feat/history-snapshot-options 2026-10-21 13:36:46 +02:00
David MannandClaude Opus 5.5 e63eb82ce0 Session::rollback keeps unrecorded visibility, as Undo does
With Make Layer Visibility Changes Undoable off, taking a step back exactly (a
cancelled Free Transform of a made layer, an abandoned Alt-drag copy, a failed
compound command) brought back the visibility from before the step; only the
fallback through Undo kept it. Carry it as Undo and Redo do.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 13:32:55 +02:00
FartmanAndBurps 755ca9e2a0 feat(print): add interactive preview positioning
Drag the visible image in the print preview using paper-scaled egui points.
Switch Center to manual without moving the grab point, allow signed Top/Left
offsets, and retain the shared preview/PDF layout and mirrored behavior.

Add regression coverage for negative PDF placement, native HiDPI dragging,
centering, clipping, scaling, fit, mirroring and invalid geometry.

Validation: 25 engine print tests, 19 file-dialog unit tests, four print-dialog
integration tests and the adversarial-command test pass. Formatting,
all-target clippy, desktop check/build and layer checks pass.
Three existing socket-binding tests are sandbox-blocked and excluded from
the successful print-suite rerun. GUI capture and wasm checks remain limited
by the environment.
2026-10-21 12:31:08 +01:00
Juan Antonio RedondoandClaude Opus 5.5 9322cc07db fix(adjust): Windows build of the LUT folder test; regenerate the scorecard (#6558)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 13:08:14 +02:00
SimoneRecchia 729e5c68ed feat(ui): Photoshop Fill/Stroke popover and full Color Picker for every colour swatch
The shape Fill and Stroke swatches (options bar and Properties) opened egui's
built-in picker, which only has RGBA fields and no hex. They now open
Photoshop's popover: No Color, Solid Color, Gradient and Pattern along the
top, the Color Picker button at the top right, Recently Used Colors and the
swatch library's folders. Gradient applies a gradient preset to the selected
shape; Pattern is shown but off, since shapes don't render pattern paint yet.

The Color Picker button opens the full Color Picker dialog (HSB, RGB, Lab,
CMYK, hex, eyedropper) titled Color Picker (Fill Color) / (Stroke Color),
with a live canvas preview; OK is one undo step (shape_fill_ui::open_paint).

Every other colour swatch built on widgets::color_edit_button* (Photo
Filter, Black & White tint, Gradient Map stop, Content-Aware Fill overlay,
Filter Gallery glow, Save for Web colour table) now opens the same Color
Picker dialog instead of egui's picker; OK hands the colour back to the
swatch through color_picker_ui::widget_tick.

Recently Used Colors are kept in Preferences::recent_colors (newest first,
15), filled by the Color Picker's OK and by popover picks.
2026-10-21 10:54:46 +00:00
David MannandClaude Opus 5.5 645e47e46d Address CodeRabbit review: slice.list lists each stored slice once, with its pieces
slice.list and slice.set report a stored slice with its own canvas-clipped
rectangle (what slice.set takes back) and its visible parts under "pieces";
a slice wholly covered by later ones is still listed, with number null.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:52:35 +02:00
Juan Antonio RedondoandClaude Opus 5.5 8afb30f58b fix(adjust): scan the LUT folder off the UI thread, skip oversized files (#6558)
Review follow-up: the Color Lookup dropdown scans the LUT folder on a
worker thread and shows the last finished scan meanwhile; files over
64 MB (larger than any LUT the parser takes) are not listed; the UI test
uses a tempfile directory.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:51:55 +02:00
David Mann 0efeabf7ad Merge remote-tracking branch 'origin/main' into fix/overlapping-slices-split 2026-10-21 12:45:50 +02:00
David Mann 4f52f0bbec Merge remote-tracking branch 'fork/fix/history-options' into feat/history-snapshot-options 2026-10-21 12:45:45 +02:00
David MannandClaude Opus 5.5 47a7f8021b Address CodeRabbit review: a rejected Perspective Crop leaves the samplers and their removed count alone (test)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:45:09 +02:00
David MannandClaude Opus 5.5 cd407f1a05 Address CodeRabbit review: refuse a Bitmap Output size past 300,000 px
Keeping the print size at a higher Output resolution could ask for more than
the 300,000 px document limit; the side was clamped, silently changing the
print size. Refuse it instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:42:22 +02:00
Reynold Hu 30d5622c51 Merge remote-tracking branch 'upstream/main' into type-recent-fonts
# Conflicts:
#	docs/scorecard.md
2026-10-21 18:41:04 +08:00
Reynold Hu e8966b9613 Merge remote-tracking branch 'upstream/main' into plug-ins-generator-enabled
# Conflicts:
#	docs/scorecard.md
2026-10-21 18:40:45 +08:00
David Mann dd99f53662 Merge remote-tracking branch 'origin/main' into fix/perspective-crop-samplers 2026-10-21 12:39:41 +02:00
David MannandClaude Opus 5.5 551241d408 Address CodeRabbit review: a turned dual symmetry splits the difference under a non-uniform Image Size
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:39:06 +02:00
David Mann 7201189695 Merge remote-tracking branch 'origin/main' into fix/symmetry-follows-canvas 2026-10-21 12:31:29 +02:00
Juan Antonio RedondoandClaude Opus 5.5 c6943482b5 feat(adjust): Color Lookup lists the LUTs in a Preferences folder (#6558)
Preferences > File Handling > LUT Folder: its .cube, .3dl and .look
files appear in Color Lookup's 3D LUT File dropdown under the built-in
looks, and picking one embeds it like Load 3D LUT... does. Agents can't
set the folder, like the other folder preferences.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:20:14 +02:00
David MannandClaude Opus 5.5 0427d52cbb Fix up the merges of #3535, #3567 and #6088: one catalog line per string, purge test as in #3567
The merges left the History Options and New Snapshot strings twice in the hu, sr, tr and vi
catalogs (this branch's old copies next to #3535's and #3567's), which the catalog consistency
test refuses; the owners' lines stay. The purge-histories test had both #3567's and this branch's
edits; it is #3567's again.

A test checks the snapshots against #3535's current visibility rule: with visibility changes not
undoable, undoing the selection of the first snapshot or a save snapshot hides a layer the eye hid
again, and Redo shows it. Regenerated docs/scorecard.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:17:13 +02:00
David MannandClaude Opus 5.5 64534add6d Address CodeRabbit review: keep a faint sparse selection in the coarse preview
The coarse Content-Aware Move preview scaled the selection down in its own
8-bit format, so scattered 1/255 pixels averaged to 0 and the preview failed
with "the selection is empty" while the command moves them. Scale the
selection in 32-bit float instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:15:27 +02:00