Commit Graph
2574 Commits
Author SHA1 Message Date
David Mann b69d1f26b0 Merge PR #11011: Crop: Fill labels follow Delete Cropped Pixels, and the Selection preset entry (#10872) 2026-11-04 19:27:41 +01:00
Trevor BrownandClaude Fable 5.1 fb3efc02fc Merge upstream/main into feat/gradient-overlay-drag (both ROADMAP.md rows kept)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-04 10:46:39 -05:00
David Mann cb323e9aea Merge PR #10965: Group action playback into one history state 2026-11-04 14:51:18 +01:00
David Mann d7e2bbe4a4 Merge PR #11077: Layers panel: filter by layer attribute (#10881)
# Conflicts:
#	crates/ui-egui/src/panels/layer_filter_ui.rs
#	docs/control-protocol.md
2026-11-04 14:51:17 +01:00
David Mann aac944a315 Merge PR #11223: Actions: map supported classic Gradient recordings
# Conflicts:
#	crates/engine/tests/it/main.rs
2026-11-04 14:51:00 +01:00
David Mann fd736f7ddc Merge PR #10986: Actions: map recorded Content-Aware Fill settings 2026-11-04 14:50:49 +01:00
David Mann a7f34dfa9f Merge PR #11222: Actions: support recorded Type Create Work Path 2026-11-04 14:50:47 +01:00
David Mann 3ea385cef3 Merge PR #11017: Layers filter: fill layers match no Kind button, and the Mode list has no Pass Through (#10878) 2026-11-04 14:50:46 +01:00
yoriswind a629a725f0 Preserve source data and diagnostics during Batch saves 2026-11-04 05:48:09 -08:00
David Mann 2c68cc6b95 Merge pull request #11203 from davidmann4/integration-batch-15
Integration batch 15: Crop, Free Transform and Actions epic PRs
2026-11-04 14:18:54 +01:00
Tareq HalabyandFredApps 2472b4a46b PSD: keep stylistic sets in Txt2 for PhotoCraft-native documents (#10313)
* PSD: keep stylistic sets in Txt2 for PhotoCraft-native documents.

needs_txt2 now covers Txt2-only OpenType flags (ss01–ss20 and non-default TXT2_FEATURES). Fresh documents get a framed point-text object with full style runs so Set 1/5 round-trip on save/reopen (#10308).

* Txt2: seed fill colour and font list on PhotoCraft-native blocks.

Fresh style runs get a /53 paint dict, and an empty font list gets a CoolTypeFont entry so index 0 resolves (CodeRabbit on #10313).

* Txt2: tag SimplePaint and ensure numbered /0 on legacy blocks.

CodeRabbit: write /99 /SimplePaint on fresh /53 dicts, and create the numbered resource dictionary before pad_frames when a legacy block lacks it.

* Txt2: treat a missing stylistic-set mask as 0 when comparing styles

A style run without key 85 used to agree with any ssNN mask, so enabling
ss01 could leave the file's runs in place on save. Align with import's
default of 0. Also restore the G8 gaps note after rebasing onto main.

* style(io): rustfmt psd_kerning stylistic-sets test

* Txt2: keep Photoshop /0 stable when seeding fonts and frames

Only seed a CoolTypeFont list and inject /0/8 when the block is
PhotoCraft-native or already had those keys / needs new frames, so
unedited Photoshop Txt2 saves stay byte-identical (#2374).

* style(text): rustfmt oversized-template assert

* PSD: keep the Txt2 scaffolding to PhotoCraft-native blocks

A file's own Txt2 block (any Photoshop era) is written as before: no
numbered /0 or /0/8 frame list is injected, a layer without a template
object gets its stub, a run without /53 isn't given one, and no
minimal style base is used. Only a block PhotoCraft creates itself
(prev.is_none()) gets fresh point-text objects, minimal runs, a seeded
font list and a frame list.

Fresh objects now write one /5 paragraph run per paragraph (UTF-16
lengths, checked conversion), as edited objects are refitted.

Tests: Photoshop blocks with an empty or missing /0 get no native
scaffolding; the oversized-template test is back to main's assertion;
fresh paragraph runs; the PSD round trip checks ss01 and ss05 on every
run.

---------

Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-04 13:28:06 +01:00
skylar taylor-barrick 68b6dbfa79 Merge pull request #10750 from RickiNano/perf/bench-cmd-refresh-split
perf(bench): split command and refresh time; refresh like the app; stop rows timing setup
2026-11-04 12:39:54 +01:00
Tareq HalabyandFredApps 4d0ecd746f Toolbar: Alt/Option-click cycles the flyout tool slot (#10301)
* Toolbar: Alt/Option-click cycles the flyout tool slot.

Matches Photoshop: plain click keeps the shown tool; Alt-click advances through the slot without opening the menu (including tools Shift+letter skips).

* Toolbar: don't fit-on-screen on rapid Alt-clicks through Hand.

Alt-click only cycles the flyout slot; exclude Alt from the Hand/Zoom double-click handlers and cover inactive-slot cycling.

* Toolbar: ignore Hand/Zoom double-click after an Alt-click.

egui pairs a plain click with a prior Alt-click as a double-click; remember the previous click's Alt so fit-on-screen and actual-pixels only run for two plain clicks.

* Toolbar: read click modifiers from the slot's pointer release.

Match DesignCraft/EffectCraft: bind release mods to the tool rect, treat any modifier as blocking Hand/Zoom double-click, and harden the Alt-cycle test by clearing i.modifiers before release.

* Toolbar: cover 1/2/3-tool Alt-click cycles and hidden-tool slots.

Addresses ReviewerA on #10301: next_slot_tool wrap cases for short flyouts, and visible_sections so Edit › Toolbar hidden tools shrink the Alt-click cycle.

* style(ui): rustfmt after rebase onto main

* Toolbar: next_slot_tool never panics on an empty slot

Index with checked arithmetic and get() (house rule: no panics on
input-derived indices); an empty slot returns the current tool. Test
added.

---------

Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-04 12:29:11 +01:00
yoriswind 508a35c83d Align Batch playback namespaces and retain child results 2026-11-04 01:51:41 -08:00
Psychotoxical c71677a159 Merge remote-tracking branch 'origin/main' into feat/layer-filter-attribute
# Conflicts:
#	crates/automation/src/server.rs
#	crates/ui-egui/src/control/tests.rs
#	crates/ui-egui/src/panels/layer_filter_ui.rs
#	crates/ui-egui/src/state.rs
#	docs/control-protocol.md
2026-11-04 09:49:44 +01:00
Hamza e85b360248 Merge remote-tracking branch 'origin/main' into fix/layer-filter-kind-and-mode
# Conflicts:
#	crates/ui-egui/src/control/tests.rs
#	crates/ui-egui/src/panels/layer_filter_ui.rs
#	docs/control-protocol.md
2026-11-04 12:48:11 +05:00
Hamza a78664046c Merge remote-tracking branch 'origin/main' into fix/crop-overlay-and-fill-defaults
# Conflicts:
#	crates/ui-egui/tests/it/main.rs
2026-11-04 12:42:11 +05:00
yoriswind 85fc78bb64 Merge current main into recorded Actions dialog support 2026-11-03 21:55:00 -08:00
NaufalDzz a6eddde4aa Select › Find Layers opens the Layers panel's Name filter (#10884)
As in Photoshop, Find Layers (Ctrl+Alt+Shift+F) no longer selects the
layers whose name matches. From the menu or its shortcut it shows the
Layers panel, switches the filter to Name and puts the caret in the Name
field with its text selected, so typing replaces it. With a `name` param
(scripts and agents) it sets the Name text instead. The layer selection
is unchanged either way.

select.findLayers no longer changes the selection and no longer fails
when nothing matches; its reply lists the matching ids in `selected`, as
before, and the Name filter applied in a new `layerFilter` field.

Fixes #10884
2026-11-04 11:36:55 +07:00
NaufalDzz 10876cb20d feat(atn): load and save Blend If and Gradient Fill layers
Blend If in a recorded layer Set loads as layer.layerStyle.blendingOptions
and plays (it was dropped without a word). The Blending Options dialog's
Set (opacity, fill, mode, Blend If, Advanced) stays one step and saves back
as one Set; with other keys those go through layer.setProps.

Gradient Fill Make and Set load as layer.newFillLayer.gradient and
gradient.fill.set with stops, transparency, midpoints, scale, offset,
dither and align. Midpoint k is the Mdpn of stop k + 1, as the PSD reader
reads it. A loaded step saves back as its recorded descriptor until it is
edited; a Noise gradient, smoothness below 100 %, a non-classic
interpolation or a transparency midpoint stay Photoshop steps.

Fixes #10771
2026-11-04 10:54:58 +07:00
yoriswind 2974772936 Map supported classic Gradient action recordings 2026-11-03 19:32:28 -08:00
yoriswind 16b24885e6 Support recorded Type Create Work Path actions 2026-11-03 19:28:31 -08:00
yoriswind 1bcf7a3c6a Merge batch 14 main before action-history review fixes 2026-11-03 17:27:25 -08:00
yoriswind 1f9f37ae8e Merge batch 14 main into Content-Aware Fill recordings 2026-11-03 17:24:10 -08:00
yoriswind 336f95cd7d Expose Move transform controls through the control channel 2026-11-03 17:17:05 -08:00
David Mann 59b49ca14f Merge PR #9979: feat(ui): live preview in Color Pickers for dialog colour fields and the Crop shield 2026-11-04 01:51:22 +01:00
David Mann 2c4666aa6e Merge PR #10814: Edit › Transform › Distort: side handles move their edge, Perspective's side handles skew (#10085) 2026-11-04 01:51:10 +01:00
David Mann 545d447c10 Merge PR #10998: Actions: map recorded Scale Effects and Create Layers 2026-11-04 00:51:01 +01:00
David Mann e06d1cbdc1 Merge PR #11067: Layers panel: filter by layer effect (#10880) 2026-11-03 22:55:47 +01:00
Trevor BrownandClaude Opus 5.5 cc5f6d6875 Merge upstream/main into feat/gradient-overlay-drag
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:45:59 -05:00
Michael Higgins 2b99fa9a5b Merge branch 'storytold:main' into fix/8806-rasterize-click-replay 2026-11-03 16:15:52 -05:00
Psychotoxical 94a6b68a04 Merge remote-tracking branch 'origin/main' into feat/layer-filter-attribute
# Conflicts:
#	crates/automation/src/server.rs
#	crates/ui-egui/src/panels/layer_filter_ui.rs
#	crates/ui-egui/src/state.rs
#	docs/control-protocol.md
2026-11-03 22:09:02 +01:00
Psychotoxical 66b9f2f68b Merge remote-tracking branch 'origin/main' into feat/layer-filter-effect
# Conflicts:
#	crates/automation/src/server.rs
#	crates/ui-egui/src/panels/layer_filter_ui.rs
#	crates/ui-egui/src/state.rs
#	docs/control-protocol.md
2026-11-03 21:55:06 +01:00
midasdf 5a00095b06 Merge remote-tracking branch 'origin/main' into pr
# Conflicts:
#	docs/target-app-parity.md
2026-11-04 05:45:54 +09:00
yoriswind 3028355333 Merge main and retain action history across Batch and Spelling 2026-11-03 12:42:57 -08:00
yoriswind 1b6bc4136c Merge main into recorded Content-Aware Fill mapping 2026-11-03 12:14:13 -08:00
yoriswind 27f86af55b Merge main into recorded layer style mappings 2026-11-03 12:12:41 -08:00
yoriswind 7763e2578f Merge main into recorded Shear mapping 2026-11-03 12:11:27 -08:00
dotCooCoo 4a7342ab5d Merge main into feat/equalize-entire-image 2026-11-03 12:02:52 -08:00
ljkxandClaude Opus 5.5 a0986a3977 Merge origin/main into feat/color-picker-live-preview
Resolve docs/ui-parity.md: keep main's status line and prepend this PR's entry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:41:33 +01:00
ljkxandClaude Opus 5.5 d8dcb0bf76 Merge origin/main into feat/photo-filter-last-settings
Resolve docs/ui-parity.md: keep main's status line and prepend this PR's entry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:41:20 +01:00
ljkxandClaude Opus 5.5 bc715316ff Merge origin/main into fix/gradient-stop-drag-off
Resolve the parity-doc conflict: keep main's status line and entries, re-add this PR's entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:40:19 +01:00
ljkxandClaude Opus 5.5 9df16201aa Merge origin/main into feat/distort-edge-handles
Resolve the parity-doc conflict: keep main's status line and entries, re-add this PR's entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:39:56 +01:00
ljkxandClaude Opus 5.5 864cf84067 Merge origin/main into feat/raw-xmp-crop
Resolve the parity-doc conflict: keep main's status line and entries, re-add this PR's entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:39:43 +01:00
ljkxandClaude Opus 5.5 6bf994514f Merge origin/main into feat/smart-sharpen-canvas-preview
Resolve the parity-doc conflict: keep main's status line and entries, re-add this PR's entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:39:35 +01:00
ljkxandClaude Opus 5.5 79b8073a8d Merge origin/main into feat/cli-metadata-option
Resolve docs/file-format-parity.md: keep main's new revision-history rows and this PR's row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 20:38:24 +01:00
David Mann 4bbe9c78de Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/scorecard.md
2026-11-03 20:32:22 +01:00
David Mann e6c4d91689 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/prefs/validate.rs
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-03 20:30:50 +01:00
David Mann 93384bf46e Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/ui-egui/src/canvas/wheel_nav.rs
#	docs/scorecard.md
2026-11-03 20:23:24 +01:00
David MannandClaude Opus 5.5 72c2585177 Merge origin/main (287352bf92) into integration-batch-13
Conflict in crates/engine/src/jobs.rs: main's save commit point (#5333,
OPEN/COMMITTED/CANCELLED phase) met the batch's cancel state
(CANCEL_REQUESTED/WORK_FINISHED). Both now share one atomic with a
COMMITTED bit; commit vs cancel and the batch's late-cancel guard each
stay one compare-and-swap. A Batch that refuses a repeated or late cancel
reports CancelRefused::Finishing ("finishing") in jobs.cancel's
notCancelled list, still {"cancelled": 0}. control-protocol.md documents both.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 19:35:44 +01:00