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.
Resolve catalog and parity-document conflicts without dropping either side.
Preserve ACT swatch routing alongside CSH shapes and add an ACT extension regression.
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.
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.
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.
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.
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>
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>
`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>
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.
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>
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).
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).
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.
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
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.
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.
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.
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.