Integration: resolve with main: .asl joins main's longer File › Open lists (xcf, xcfgz, gz); each language keeps main's new strings and #4049's Styles strings; docs status lines joined.
Integration: resolve with main for area type (#6230)
- Image Size with a new resolution (#7124, canvas_geom::set_resolution) now scales an area type's
path with the text space like a box or a type path, so the same words wrap onto the same lines;
test a_resolution_change_keeps_area_type_wrapping_where_it_was fails without it.
- The Paragraph panel's justify buttons (#7713) stay available on area type, which is paragraph
text in Photoshop; test justify_buttons_work_on_area_type.
- Test files: main's tests plus #6230's; layout.rs imports joined; docs and scorecard regenerated.
Integration: resolve smart_map.rs with main's 27 new smart filters (#6296 and others): both filter lists kept (49 mapped); #5249's enum readers/writers use main's equal enum_name/enum_param instead of its own copies, its test helper is photoshop_fltr_item next to main's photoshop_item, and the unknown-filter test uses Shear, since main now maps Crystallize and #5249 maps Twirl.
17f149e7 keys mask thumbnails on the document height as well as the
width; main's #2117 test still computed the old width-only key.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Integration: the shape options bar moved to shape_options.rs (#5452) while main and #6472 changed it in vector_ui.rs: carry over the per-gesture undo key, stroke_enabled and the 0 px stroke guard; paint_gesture is now pub(crate).
Include the native format crate in Windows platform selection so publication barriers and retry regressions execute in the unit and integration CI legs. Document the durability helpers and regression tests flagged by review.
Validated 20 platform-selection scenarios and all 130 native Windows format tests, plus formatting, Clippy, layering and the format WebAssembly check.
- smart_ui.rs: confirm_command sends every Smart Filter edit through
smart_filter_dialog::edit_command, the builder the canvas preview
already uses, so preview and OK cannot build different payloads.
- lib.rs: the mask thumbnail cache revision includes the document height
as well as the width. Two documents that restore the same layer id and
width no longer share a thumbnail framed for the other's height.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts:
- filter_dialog.rs: preview_document_for_target keeps our proxy scaling
and `p` clone; main's Bitmap rule (the preview drops Output resolution,
#5559) is applied to the same `p`.
- hu/sr/tr/vi catalogs: both sides appended rows at the end; kept both, no
duplicate keys.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
One conflict, pattern_cmds.rs: insert_fill_layer keeps the default_mask
argument and takes main's placement(command, params)? signature.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- canvas.rs: the Content-Aware Move preview now comes before the
Layers-panel reorder preview. The reorder preview is built from the
session document and would drop a pending Content-Aware Move result.
- layer_multi_cmds.rs: preview_rejects_invalid_drop_unchanged also runs
layer.moveTo for each rejected drop: the missing target, `into` on a
non-group and the invalid position are errors, the self-drop is a
no-op, and the document stays unchanged each time.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The Fuzz step interpolated the user-controlled workflow_dispatch input
${{ inputs.fuzz_seconds }} directly into a run: shell command, allowing
script injection by whoever triggers the workflow. Pass it via an env var
(FUZZ_SECONDS) and reference "$FUZZ_SECONDS" so the value is treated as
data, not shell. Resolves SonarCloud githubactions:S7630 (BLOCKER).