Commit Graph
3891 Commits
Author SHA1 Message Date
Khawar Zamman WaniandClaude Opus 5.5 44c9ae32e3 Merge origin/main into fix/6501-multi-layer-free-transform
docs/ui-parity.md: kept main's View › Extras row (#6699) beside this branch's several-layers row, and both status-line entries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 09:52:47 +05:30
Khawar Zamman WaniandClaude Opus 5.5 375a278545 Merge origin/main into pen-path-operations
Conflict in docs/ui-parity.md was only the status line: kept main's change list, prepended this branch's entry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 09:49:48 +05:30
Ratul Paul b088a6cbac Merge upstream main and retain complete UI scale coverage
Preserve upstream progress documentation alongside the scale-preset notes.
Add numeric preset labels to the newly introduced Hindi catalog, keeping all
21 catalogs covered. Preserve contributors, tests and existing coauthor credit.

Validation: fmt, locked engine/UI tests (6196 passed), Clippy, layers, wasm,
scorecard generation/check, and panic_hunt all passed.
2026-10-23 10:04:33 +06:00
Gabriel Luís da Silva 75a5f03e73 Export an adjustment edit whose document is null, like its layer
A null document is the active one, as the command reads it; only a step
that names a layer or document is refused.
2026-10-22 23:42:55 -03:00
Omar Saidahmed 46997691af document the split builders 2026-10-22 22:41:46 -04:00
Omar Saidahmed 101ce989b9 split oversized filter, adjustment, crop and effect builders 2026-10-22 22:41:46 -04:00
Gabriel Luís da Silva 13ba4fcb6f Export an adjustment edit whose layer is null, like the target layer
A null layer means the target layer, as layer_ref reads it, so the guard
refuses only a layer that names one.
2026-10-22 23:21:52 -03:00
jonathanwxh-cellandClaude Opus 5.5 7faefe61bf Merge main into the opening-order follow-up
Main already has this PR's .atn document-switch import (46b1cda2). Keep
main's placement of the select arm and event id, and carry only the
opening-order wording; gaps.md keeps main's entries plus this PR's row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 08:52:46 +08:00
Finn NewickandClaude Opus 5.5 86761e7429 fix(fill): keep CMYK typed for a Solid Color fill in a CMYK document
The Solid Color picker passed only its sRGB stand-in to
layer.newFillLayer.solidColor and solid_fill.set, so CMYK 50/50/50/100
typed in a CMYK document came back as other inks (57/47/45/91 in the
report). Both commands take the inks the colour was picked as (`cmyk`)
and store exactly those in a CMYK document; a new fill seeded from the
foreground uses its CMYK pick, as fills do since #4196. The dialog passes
the CMYK it holds, and reopening a CMYK fill's picker shows its inks.

Fixes #8568

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 23:52:26 +01:00
Finn NewickandClaude Opus 5.5 82f7d87072 fix(actions): keep partial Camera Raw splits and odd curves as Photoshop steps
A step with only some of PC_1..PC_3, or a point curve that isn't a list,
now stays a Photoshop step instead of importing without that setting.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 23:42:20 +01:00
Gabriel Luís da Silva 62665c2aff Refuse exporting an adjustment edit that names its layer to .atn
The Set event Photoshop plays edits the current adjustment layer, so a
layer.setAdjustment step that names another layer (or document) played
back on whichever adjustment layer was active. Refuse it in strict export,
as layer.fill.pattern.set already does; skipUnsupported skips it. Steps
recorded on the selected layer carry no layer and still export.

Fixes #8532
2026-10-22 19:41:13 -03:00
Jeremy YaoandClaude Opus 5.5 a0f29d4cc2 Merge branch 'main' into feature/animation-effects
Brings in 2794 commits from main (98de85c6). Resolved as the PR review
suggested:
- wheel_nav.rs, canvas.rs, panels.rs: main's read_with(.., smooth,
  touch_gestures) stays, and its callers (the canvas's two wheel reads and the
  Navigator) pass the resolved Animation Effects value,
  !app.prefs_rt.animations_off, instead of the removed
  interface.enable_animations. That flag works in every window, a second OS
  window for a document included; unsmooth stays for the main window's panels
  and lists.
- apps/photocraft/Cargo.toml: main's NSGraphics feature (Beep When Done) next
  to this branch's NSAccessibility and NSWorkspace.
- docs/scorecard.md is regenerated; the UI-217-10 note says where the glide
  is taken out now.
- French and Russian gained their own "On" entries on main, so this branch's
  copies are dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 18:33:59 -04:00
David MannandClaude Opus 5.5 ea2acdeea5 Merge fix/history-options (#3535, with origin/main 98de85c64) into feat/history-snapshot-options
engine chrono now comes from the workspace (with clock); the form dialog uses main's form_keys; the History panel's follow key uses doc_id; cs keeps main's New Snapshot row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 00:27:10 +02:00
David MannandClaude Opus 5.5 30d3db752b Merge origin/main into fix/history-options
Main's keep-clean revision bump (#6865) now also applies to rollback; Turkish History terms follow main's Geçmiş.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 00:07:59 +02:00
David Mann c16f899467 Merge origin/main into fix/6544-lut-format-roundtrip
# Conflicts:
#	crates/format/tests/it/roundtrip.rs
2026-10-23 00:06:48 +02:00
David Mann bc8973098e Merge origin/main into feat/ui-217-4-columns-unit
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-10-23 00:00:55 +02:00
eiketre bd74b7fef9 Merge upstream main into fix/multilayer-transform-handles 2026-10-22 23:57:50 +02:00
SimoneRecchia 812aea6807 Merge remote-tracking branch 'upstream/main' into claude/busy-ptolemy-02a3az
# Conflicts:
#	docs/ui-parity.md
2026-10-22 21:56:39 +00:00
David Mann 3ab8055f03 Merge origin/main into fix/snapshot-followups
# Conflicts:
#	docs/ui-parity.md
2026-10-22 23:52:03 +02:00
Finn NewickandClaude Opus 5.5 17f5c041d8 feat(actions): import recorded Camera Raw Filter steps as filter.cameraRaw
`Adobe Camera Raw Filter` steps in .atn files imported as
actions.photoshopStep placeholders, so many retouching actions stopped at
them. They now import as filter.cameraRaw, with the Basic, tone curve,
point curve, colour mixer, colour grading, detail, grain and vignette
settings, using the descriptor keys of 62 recorded steps and the verified
PSD Smart Filter mapping. Steps that use settings the command lacks
(Calibration, non-Custom white balance, active neutral-only controls)
stay Photoshop steps rather than replaying a different look. Export
stays refused: the written step's version keys are unverified.

Part of #6745

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:50:19 +01:00
David Mann 1efa06b715 Integration: merge main (c36e46c38 #8680, #8668, #6705)
# Conflicts:
#	docs/ui-parity.md
2026-10-22 23:47:54 +02:00
David MannandClaude Opus 5.5 07bb7c2522 Integration: enable Generator in the Image Assets artboard tests (#8254)
#5598 made File > Generate > Image Assets require Preferences > Plug-ins >
Generator, so #8254's two artboard tests got Disabled. Enable it first,
as #5598's own test does.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:40:21 +02:00
David Mann adace9a86f Integration: #8254 second fix-up (an empty artboard asset is refused, as in Photoshop's Generator) 2026-10-22 23:40:20 +02:00
David Mann 2bfc24d9f8 Merge PR #8180: fix(actions): strict .atn export keeps Apply Image's flat source fields (#7197) 2026-10-22 23:40:20 +02:00
David Mann 7c9d6ac344 Merge PR #8150: fix(automation): doc.replaceSmartObject replaces Smart Object contents from the read root (#8061) 2026-10-22 23:40:19 +02:00
David Mann 18124238f7 Merge PR #8502: fix(actions): accept Photoshop stringID blend modes (#8454) 2026-10-22 23:40:19 +02:00
David Mann c436f61d53 Merge PR #7202: fix(atn): import a recorded Save As with its destination (#7102) 2026-10-22 23:40:18 +02:00
David Mann ee85da2ffd Merge PR #8527: fix(atn): export Black & White adjustment layers with Photoshop's BanW class (#8481) 2026-10-22 23:40:17 +02:00
David Mann 9ee6c407b6 Merge PR #8254: Image Assets: optionally keep a transparent artboard's full size 2026-10-22 23:40:16 +02:00
David Mann a23c29b53a Merge PR #5878: Preferences: old settings files take Shift-to-switch-tools on (#5647) 2026-10-22 23:40:16 +02:00
David Mann 24051914fd Merge PR #6352: fix(engine): honor lock all on layer mask commands 2026-10-22 23:40:15 +02:00
David Mann 5301a128b8 Merge PR #8509: fix(atn): preserve unsupported event kinds 2026-10-22 23:40:13 +02:00
David Mann 7be48940b3 Merge PR #8518: fix(engine): select files correctly in Windows Explorer 2026-10-22 23:40:13 +02:00
David Mann 6e4d89d13d Merge PR #8473: test(panic_hunt): give the panic-counting self-test its own deadline 2026-10-22 23:40:12 +02:00
8a2d35fcd2 Integration: an unchanged dialog keeps a baked overlay's exact ends (#7335)
After merging main, the Layer Style dialog always sends From/To as 8-bit
hex (#7072). On a baked Gradient Overlay without a source record (PSD or
.asl import) the custom and no-record paths wrote those hex ends back,
so OK without a change rounded the curve's ends (a Smooth bake's white
end 0.99999994 became 1.0, Lab ends became RGB). Like edit_endpoint for
the recorded source, a hex end that only repeats the current end is now
left out. baked_overlay_is_unchanged_until_method_selection_then_edits_
the_whole_curve fails without this.

Co-authored-by: oRE-o <42003350+oRE-o@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:40:12 +02:00
David Mann fff01d8918 Integration: stack #7335 (its merge onto main, conflicts resolved) 2026-10-22 23:40:11 +02:00
David Mann 6cb8673e8f Integration: stack #6658 (its merge onto main, conflicts resolved) 2026-10-22 23:40:11 +02:00
David Mann c6e628afad Integration: stack #5815 (its merge onto main, conflicts resolved) 2026-10-22 23:40:10 +02:00
David Mann 8748dcbf16 Integration: stack #5598 (its merge onto main, conflicts resolved) 2026-10-22 23:40:09 +02:00
David MannandClaude Opus 5.5 6c7e920d5a Merge PR #7335: Gradient Overlay: add Method selector and retain editable source stops
- crates/ui-egui/src/layer_style.rs: values_of keeps the PR's method/smoothness keys and source-stop ends, and main's (#7072) unconditional From/To and geometry fields.
- crates/compose/src/cmyk_tests.rs (no textual conflict): add the PR's new `interpolation: None` field to main's CMYK test GradientOverlay literal.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:39:14 +02:00
David MannandClaude Opus 5.5 6aa27edb06 Merge PR #6658: fix(ui): confirm opening damaged PSD/PSB documents
crates/io/src/lib.rs: kept main's ImportOptions; import_for_open/_with and import_stages now take &ImportOptions (plus the PR's damaged flag); import_with_options_and_interrupt delegates to import_for_open_with.
crates/engine/src/jobs.rs: open job decodes via import_for_open_with(&opts) so the damage flag reaches the held-open path; main's raw_defaults and docId kept.
crates/ui-egui/src/lib.rs: open_bytes_from uses main's import_options + raw_defaults and the PR's PSD damage check via import_for_open(&opts).
Also: moved crates/io/tests/psd_recovery_generated.rs to tests/it/ (mod added, support path fixed) and adapted PR tests to ImportOptions.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:39:09 +02:00
David MannandClaude Opus 5.5 cab3ef6191 Merge PR #5815: perf(doc): share the XMP packet, Duotone PSD data and unsupported adjustment bytes between snapshots
- crates/engine/src/tests.rs: kept both tests (main's restore_layer_selection test and the PR's history_states_share_large_document_payloads).
- crates/io/src/psd_import.rs: kept main's parsed Duotone inks (duotone_map) with the PR's Arc<[u8]> psd_raw; also main's unknown-adjustment-key import (#6575) now builds Arc<[u8]> raw.
- crates/io/tests/adjust_warnings.rs: moved to tests/it/adjust_warnings.rs on main; PR's .into() edits applied there, plus #6322's Color Lookup test (raw.as_slice().into()).
- docs/architecture.md: union; status line names both changes, both revision-history rows kept.
- Adapted main-new sites to the PR's types: psd_export.rs (Duotone write-back via as_deref/to_vec, Unsupported block compare by slice), inspect.rs and ui-egui unsupported_marker_tests.rs (raw .into()), io tests/it/psd_unknown_adjustment.rs (slice compare).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:38:56 +02:00
David MannandClaude Opus 5.5 ced9aa6947 Merge PR #5598: Plug-ins: wire Enable Generator (Image Assets needs it)
docs/scorecard.md: conflict in generated file, kept ours (b7-base); regenerated later.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:38:50 +02:00
David MannandClaude Opus 5.5 f56147655d Merge PR #5485: Add opt-out startup release checks and manual update status
Conflicts resolved:
- crates/ui-egui/src/i18n/hu.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/i18n/ru.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/i18n/sr.tsv: kept base's added sections, then the PR's update-check keys
- crates/ui-egui/src/i18n/tr.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/menus.rs: kept base's saved-workspace entries, then the PR's Help › Check for Updates reordering
- docs/gaps.md: base status line with the PR's G17 clause prepended; PR revision row above base's rows
- docs/target-app-parity.md: base status line (updated 2026-10-22) with the PR's clause prepended; PR revision row above base's rows
- docs/scorecard.md: generated, took b7-base's version

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:38:46 +02:00
dotCooCoo 4e3c151ba1 Actions: recorded Check Spelling steps play on the targeted type layer
When an action records a step whose `layer` names the only selected
layer, recording drops `layer`, and the step plays on the layer that is
targeted at playback (#7262). `edit.checkSpelling` handled a missing
`layer` in two other ways. `change` required a numeric `layer`, so a
recorded Change from the Check Spelling dialog or the canvas menu
stopped playback with "`change` needs `layer`" and left the text
unchanged. `list` and `changeAll` check every type layer when neither
`layer` nor `allLayers` is given, so a recorded `changeAll` that named
the selected layer played on every type layer.

`change` now takes its layer from `layer` (an id or a name) or else the
active layer, as `type.insertText` does. When recording drops `layer`
from an `edit.checkSpelling` step, it also records `"allLayers": false`.
2026-10-22 14:35:37 -07:00
SimoneRecchia a5d555a3d0 Merge storytold/photocraft main into the Fill/Stroke popover branch
Conflicts:
- vector_ui.rs: main gave egui's shape picker a hex field and a screen
  colour button; this branch replaces that picker with the popover, whose
  Color Picker has both, so the popover version is kept.
- vector_paint_tests.rs: main's zero-width stroke tests are kept; its two
  hex tests now type and paste into the Color Picker the popover opens
  (the test harness draws dialogs, as the app does).
- i18n catalogs: both sides' new strings kept; fr and ru keep main's
  translations of Color Picker, Solid Color and Tint Color.
- paint_picker.rs uses photocraft_color::convert::hsb_to_rgb, which
  replaced color_picker_ui::hsv_to_rgb on main.
- docs: both sides' rows and revision entries kept; scorecard regenerated.
2026-10-22 21:24:19 +00:00
5c772cf540 Integration: refuse empty artboard assets (#8254)
Exporting artboard assets at the full board wrote a blank, fully
transparent board-size PNG for an empty artboard, or one whose contents
all sit outside the board. main refused those with "the layer is empty",
and Photoshop's Generator refuses a zero-bounds pixmap before it pads to
the board. The board is now used only when its composite has a visible
pixel; otherwise the asset fails with "the layer is empty".

Test: image_assets_refuse_empty_artboards (an empty transparent board and
a board whose only layer is outside it) expects no files and two "the
layer is empty" errors; without the check both are written as blank PNGs.

Co-authored-by: IbrahimOezhan <89545837+IbrahimOezhan@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 22:05:01 +02:00
d921fedcca Integration: export dialog-recorded Apply Image channels, refuse numeric selectors (#8180)
The Apply Image dialog sends Channels-panel names in sourceChannel ("RGB" by
default, "Red", "Alpha 1"), but the export matched only lowercase keys, so a
dialog-recorded Apply Image failed strict .atn export. Channel names now map
case-insensitively (RGB/CMYK/Lab to the composite), an alpha channel is written
as a Chnl name reference and read back on import, and a numeric layer or channel
selector is refused instead of becoming the merged composite.

Tests: apply_image_dialog_channel_names_survive_a_strict_export (the dialog's
exact params) and apply_image_numeric_source_selectors_are_refused; both fail
without the fix.

Co-authored-by: VishnuByrraju <112673081+VishnuByrraju@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 21:51:51 +02:00
David Mann aa87afc886 Integration: merge main (#8180) 2026-10-22 21:39:51 +02:00
1bfae77c16 Integration: test stringID blend modes through .atn import (#8502)
The PR's test only called blend_label/blend_ps. This adds one through the
import entry point: a Set Lyr step with Md enm("BlnM","softLight") and a
Make layer step with Usng Md "luminosity", written with atn::write and
imported, must give layer.setProps blend "Soft Light" and layer.new.layer
mode "Luminosity" with no unsupported steps. Without the PR's table rows
the Set step is unsupported (and the Make falls back to Normal).

Co-authored-by: justinjohn0306 <34035011+justinjohn0306@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 21:39:28 +02:00