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>
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>
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>
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>
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>
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
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>
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>
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>
`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>
#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>
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>
- 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>
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>
- 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>
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>
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`.
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.
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>
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>
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>