Commit Graph
3891 Commits
Author SHA1 Message Date
jonathanwxh-cell e88d24bc04 Fix ATN document offsets after tab reordering
Resolve relative activation against stable document opening order while keeping absolute indices in visual tab order. Preserve lifecycle identity across close, reopen and imported-ID collisions.

Add command and ATN playback regressions and document the behavioral source evidence.
2026-10-22 17:42:50 +08:00
jonathanwxh-cell 99dbe727ae Merge main preserving ACT and CSH preset imports
Resolve catalog and parity-document conflicts without dropping either side.
Preserve ACT swatch routing alongside CSH shapes and add an ACT extension regression.
2026-10-22 17:22:50 +08:00
GyoJoong Kum 52ed7ed27e fix(engine): reject malformed tool preset color channels 2026-10-22 08:32:11 +00:00
GyoJoong Kum 432b1e3f43 fix(engine): validate tool preset colors before applying state 2026-10-22 08:12:30 +00:00
PerchAnton 8df3ffd307 fix(engine): simplify displacement map predicate for strict Clippy 2026-10-22 10:45:59 +03:00
D-monizedandClaude Opus 5.5 1b2e5b5536 Merge origin/main into feature/font-recent-favorites
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 01:43:10 -06:00
GyoJoong Kum cbb0406c2b fix(ui): preserve CMYK picks and complete color persistence docs 2026-10-22 07:35:50 +00:00
PerchAnton b165afc332 Merge main into #7721 and retain exact Crystallize and Ripple fields 2026-10-22 10:12:20 +03:00
GyoJoong Kum 6dacefce4d fix: remember foreground and background colors across launches 2026-10-22 07:11:47 +00:00
Joe 11123f64b1 Merge remote-tracking branch 'upstream/main' into feat/psd-puppet-warp-2
# Conflicts:
#	crates/engine/src/smart_cmds.rs
#	crates/io/src/smart_map.rs
2026-10-22 12:57:54 +07:00
zuujiscom afa4cc7964 test(panic_hunt): give the panic-counting self-test its own deadline
contained_panics_count_and_graceful_errors_do_not used the 4 s hang
budget meant for fuzzed commands. With RUST_BACKTRACE=1 the panic hook
prints a backtrace, and on loaded Windows runners the first symbol
lookup took long enough (19.6 s) that run_watched returned None instead
of Some(false). The self-test now waits up to 120 s; the fuzz keeps 4 s.
2026-10-22 00:53:45 -05:00
Matt Van HornandClaude Opus 5.5 fce4314643 Art History Brush: add it to the engine's tool table
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019jP1NBrfG9D7pKJLkd5yre
2026-10-21 22:48:10 -07:00
Matt Van Horn f7ce6196b3 Art History Brush: reject a history state that does not fit usize
history_source cast the u64 state with `as usize`, which truncates silently on wasm32. Use usize::try_from and return the usual "no history state" error instead.
2026-10-21 22:48:10 -07:00
Matt Van Horn 4571843c27 Add Art History Brush to the Y-group flyout
paint.artHistoryBrush stamps oriented dabs sampled from a history
state. Styles cover Tight/Loose Short, Medium, Long, Dab, Tight Curl
and Loose Curl. Area sets spacing; Tolerance skips dabs whose
footprint already matches the source. Scatter is seeded so a stroke
replays bit-for-bit.

The Y flyout lists History Brush then Art History Brush. The options
bar exposes Style, Area and Tolerance. Includes a 24 MP release bench.
2026-10-21 22:48:10 -07:00
Joe eaac405f56 fix(psd): a stored Puppet Warp mesh is drawn only while the filter and placement are unedited
The mesh a Photoshop file stores was drawn whenever the pins were unchanged:
- a solver setting (mode, density, expansion) set after import had no effect
  and was lost on save, since imported params set none. A set one now counts
  as an edit: the pins are solved, and export refuses it like moved pins.
- the mesh is in document pixels where the layer was on import, but was still
  drawn after the smart object was moved, transformed or warped, leaving
  pixels outside its triangles missing. Import now records the placement
  (SmartObject::placement_json: transform, perspective, warp) on the mesh,
  and the smart filter replay drops a mesh made for another placement.
  Replace Contents keeps the placement, so mockups still use the mesh.
2026-10-22 10:50:35 +07:00
Khawar Zamman WaniandClaude Opus 5.5 a3b6850970 review: Save for Web checks its settings before dropping a floating selection
save_for_web_with_writer committed a floating move (a document edit)
before WebSettings::from_params, so a bad on/off value like
"lossless": "yes" failed after changing the document. Settings are
checked first now; a valid export still drops the selection first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 09:19:10 +05:30
Khawar Zamman WaniandClaude Opus 5.5 302177715c review: Merge Shape Components refuses a lone open anchor too
A one-knot open subpath strokes as a dot under a round or square cap;
baking dropped it. Any non-empty open subpath is now refused, as longer
ones already were.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 09:19:08 +05:30
Khawar Zamman WaniandClaude Opus 5.5 a83b2f848e review: a null layer beside layers is absent; Warp keeps several layers' box
`edit.transform` refused {"layers": [...], "layer": null}, though `null`
means "not given" everywhere else (explicit_layer). And the Warp button
took the type-warp branch before enter_warp's several-layers guard, so
with a type layer active among several it warped that layer alone while
the preview moved them all: the guard now runs first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 09:19:05 +05:30
Yonghyuk Choi bea003acd8 Rebuild unrecorded Gradient Overlays from their end colours 2026-10-22 12:38:20 +09:00
Yonghyuk Choi dc029b93c5 Merge main into Gradient Overlay method branch 2026-10-22 12:38:20 +09:00
Ratul Paul ff632ed532 Merge upstream main and preserve UI scale documentation
Reconcile progress documentation while retaining upstream performance caveats
and current UI parity status alongside the intermediate scale preset notes.

Validation: fmt, full locked engine/UI tests (5660 passed), Clippy, layers,
wasm, scorecard generation/check, and panic_hunt all passed.
2026-10-22 09:23:58 +06:00
Khawar Zamman WaniandClaude Opus 5.5 16d1bc2f1f fix(retouch): carry the Smudge pickup neighborhood through with_effect_on
main split LiveDab's constructor into with_effect (session) and
with_effect_on (a prepared document copy) after #7848's fix was written,
so the cherry-picked fix no longer compiled. with_effect_on keeps its
halo signature for the eraser and Pattern Stamp callers; the body moves
to with_neighborhood_on, which Smudge's live stroke reaches through
with_neighborhood.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 08:31:29 +05:30
skylar taylor-barrick f4cff2780c test(retouch): name live dab replay regressions by behavior 2026-10-22 08:16:51 +05:30
skylar taylor-barrick 0635061b86 fix(retouch): preserve Smudge pickup through live stroke release 2026-10-22 08:16:51 +05:30
aiongg 62d4573609 Integration: cargo fmt 2026-10-22 02:41:49 +00:00
aiongg 624b7ebaf7 Integration: #7262 Clipping Mask export refuses a numeric layer reference, as the other layer events do 2026-10-22 02:32:30 +00:00
aiongg 1e0532c7ff Integration: cargo fmt 2026-10-22 02:31:11 +00:00
aiongg d3cc3a69fb Integration: #8344 compare the Photo Filter dictionary as bytes (the field is Vec<u8> on main) 2026-10-22 02:30:49 +00:00
aiongg dfde38919e Merge PR #7883: Save As JPEG: JPEG Options dialog (quality 0–12, Baseline / Optimized / Progressive) (FILE-215-19)
crates/ui-egui/src/lib.rs: replay_save doc comment names both Export As and JPEG; replay_save uses the PR's FormatChoices::from_step, after main's export_dialog::replay branch.
docs/file-format-parity.md: header keeps main's text plus the JPEG Options item (last updated 2026-10-19); TIFF row is main's, JPEG row is the PR's; change-log rows once each, newest first.
docs/gaps.md: header keeps main's text plus the G10 item (last updated 2026-10-19).
2026-10-22 02:27:46 +00:00
aiongg 0ad6cfccd7 Merge PR #7795: Print: Scale to Fit Media fills the driver's printable area (#7782)
Conflicts:
crates/engine/src/print_cmds/tests.rs: appended tests, kept both
2026-10-22 02:27:40 +00:00
aiongg 57028352b4 Merge PR #7662: Preferences: Zoom Resizes Windows resizes floating document windows, and the Zoom tool shows it as Resize Windows to Fit (#204)
crates/engine/src/prefs.rs: neither general.zoomResizesWindows (this PR implements it) nor general.animatedZoom (PR #3698 in this track implements it) stays in HIDDEN_UNTIL_IMPLEMENTED.
crates/ui-egui/src/prefs_ui.rs: kept both is_hidden asserts.
crates/ui-egui/src/i18n/*.tsv (20 catalogs): union of both sides' rows; no duplicate (context, source) keys.
docs/scorecard.md: ours (regenerated at combine).
2026-10-22 02:27:20 +00:00
aiongg 79ff67c3f2 Merge PR #7249: fix(atn): reject non-replace select.rect modes in .atn export (#7194)
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:27:06 +00:00
aiongg e42cfd2159 Merge PR #7574: Move tool: moving selected pixels shrinks the selection, transform controls and snapping to them (#7538)
crates/engine/src/float_cmds.rs: kept main's cut_piece (parallel, shares full tiles) and try_lift_coverage, and the PR's CutParts::outline; the outline is read from the piece's alpha, which holds min(alpha, selection) as the PR's own lift loop computed, instead of replacing cut_piece with that loop.
crates/engine/src/float_cmds/tests.rs: git interleaved the two sides' new tests; took main's file and appended the PR's added tests whole.
docs/ui-parity.md: header line keeps main's text plus the PR's #7538 item.
2026-10-22 02:26:55 +00:00
aiongg ac0e29ca4c Merge PR #7115: fix(atn): map Apply Layer Comp steps by name (#7101)
Conflicts:
docs/gaps.md: header line is ours plus the PR's missing change item (later Last updated date); change-log rows kept both, newest first
docs/file-format-parity.md: same
2026-10-22 02:26:51 +00:00
aiongg d1f5bae8c3 Merge PR #7232: fix(atn): export recorded layer.select with name parameter (#7185)
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:26:31 +00:00
aiongg 8a4fe7c607 Merge PR #7656: Refuse .atn export of resolution-only Image Size without keepPrintSize
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended tests, kept both
2026-10-22 02:26:26 +00:00
aiongg 02c9e32d1d Merge PR #8088: fix(type): resolve exact PostScript names in type.create 2026-10-22 02:26:06 +00:00
aiongg 4eef797fdf Merge PR #7968: fix(atn): a Group Layers step keeps its explicit layer through .atn (#7236)
Conflicts:
crates/engine/src/atn_cmds/tests.rs: appended test helper and tests (two blocks), kept both
2026-10-22 02:25:59 +00:00
aiongg d38019873a Merge PR #7142: perf(type): refresh type layers without cloning the document (#7092) 2026-10-22 02:25:53 +00:00
aiongg a77b078589 Merge PR #7417: Camera Raw: choose the demosaic method when a raw opens
crates/io/src/lib.rs: kept main's import_psd (and its call in import_stages); import_stages takes the PR's ImportOptions argument.
crates/io/src/raw.rs: the PR's demosaic summary on main's developed_document(name, bytes, ...) call.
docs/scorecard.md: ours (regenerated at combine).
2026-10-22 02:25:41 +00:00
aiongg 49a09628b6 Merge PR #7637: Record one action call when playback pauses for a step dialog
Conflicts:
crates/ui-egui/src/i18n/*.tsv (20 catalogs): rows kept both; no duplicate (context, source) keys
2026-10-22 02:25:34 +00:00
aiongg 624c9b743e Merge PR #7262: fix(atn): reject numeric layer references in .atn export (#7248)
crates/engine/src/jobs.rs: kept both Running fields (recorded_by, pre_selected) and both initialisers; main's new_fx_target block and foreign-recording flush kept; after_command takes the PR's pre_selected argument at both call sites.
2026-10-22 02:25:23 +00:00
aiongg b7e01f8bda Merge PR #7591: fix(atn): refuse strict export of canvas-bound selection modifies and placed pattern buckets
crates/engine/src/atn_cmds.rs: no `uncarried` macro arm; the four Select > Modify events (Feather, Expand, Contract, Smooth) use the existing `unless` arm with a new predicate `applies_at_canvas_bounds` (wraps the PR's `flag_set`). Helper fns kept both (`preserves_roundness`, `flag_set`).
crates/engine/src/atn_cmds/tests.rs: both sides' appended tests kept whole.
2026-10-22 02:24:51 +00:00
aiongg 3a72e25b02 Merge PR #3921: feat(layer-style): expose Bevel & Emboss highlight and shadow shading
crates/engine/src/layer_style.rs: union of main's glossAntiAlias and the PR's six shading params in the bevel defaults and overlay_effect; both sides' tests kept.
crates/ui-egui/src/layer_style.rs: union: P::Contour(Some("glossAntiAlias")) plus the six new rows and values_of lines.
crates/ui-egui/src/i18n/*.tsv (16 catalogs): union of both sides' rows; no duplicate (context, source) keys.
2026-10-22 02:24:33 +00:00
aiongg 2529a433a0 Merge PR #8371: Fix compound layer property exports in the reference app actions
docs/gaps.md: header line kept from main with the PR's change entry prepended; the PR's change-log row placed above main's 2026-10-21 row.
2026-10-22 02:24:10 +00:00
aiongg fe28d9d43c Merge PR #7395: Auto-Blend Layers: mask and blend the whole layers, past the canvas too
crates/engine/src/align_cmds.rs (tests module): four interleaved hunks of new tests; resolved as all of ours, then all of theirs, each test whole.
2026-10-22 02:24:08 +00:00
aiongg 86ec88209a Merge PR #8287: Keyboard Shortcuts: the dialog switches sets through the engine too (#8286) 2026-10-22 02:24:03 +00:00
aiongg 8882086fd1 Merge PR #8232: Plug-ins: a reduced live preview scales the settings a manifest marks "unit": "px" (#7524) 2026-10-22 02:24:02 +00:00
aiongg ff2ba37278 Merge PR #8353: Scale shape strokes when resizing for Export As
crates/ui-egui/src/export_dialog.rs: tests appended by both sides; kept both whole.
2026-10-22 02:23:59 +00:00
aiongg 46adea7eb8 Merge PR #8344: Actions: Photo Filter saves to .atn under the name the reference app runs (#8301)
crates/engine/src/atn_cmds.rs (EVENTS): main builds adjustment events with adjustment_event!; kept main's Black & White macro line and used the PR's by-name Photo Filter (empty code) through the same macro, with the PR's comment.
2026-10-22 02:23:59 +00:00