dialogs.rs: main's Displace-map prompt runs before the fallible confirm_command. filter_dialog.rs: main's ask_displace_map uses the new confirm_command signature; SMART_FILTER_SET_PARAMS stays for main's uses; a smart-filter edit without a "layer" param previews the active layer, as the command runs it (main's smart_displace_preview_uses_the_map_document).
Baking traces the path's fill, so an open subpath came back closed, or,
a straight one, as nothing, losing the geometry a stroke draws. bake_path
now returns an error for any open subpath with a segment, which covers
the shape-layer, path and multi-layer Combine Shapes merges. Addresses
CodeRabbit's review on #7648.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main replaced MAX_TRANSFORM_PIXELS with a memory budget from Preferences
(#7807); keep that and this branch's multi-layer helpers above it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main added WorkPixels (a float, tile-filled working copy for the Background
Eraser and Impressionist Pattern Stamp, a depth-rounded full copy otherwise)
alongside this branch's WorkTiles. Keep WorkTiles for every live dab stroke,
since the commit takes over its pixels and needs full precision, and drop
WorkPixels with with_effect_on's `precise` flag. LiveDab::base is set by
with_effect only, the path whose strokes a commit can take over.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Create/Release Clipping Mask and Brightness/Contrast, Black & White and
Gradient Map were written out by hand with the same body as
adjustment_event! or each other, which SonarCloud counts as duplicated new
code (photocraft's quality gate fails on 9.8% duplication from the GrpL
entry). adjustment_event! takes an optional command id, and clipping_event!
builds the two clipping events. The mapping table is unchanged.
#3289, #3974 and #3975 landed in main, so the Smart Filters row code meets
#3974's thumbnail geometry.
Conflicts:
- smart_ui.rs: the rows keep our layout (separate name and Blending
Options targets, shared disclosure, real mask thumbnail) and take
#3974's geometry: the header height and the shared-mask side come from
smart_filters_header_geometry, sub-rows are SUB_ROW_H, the mask is
hidden at None and the header name follows it. #3974's own
drag_started and selection handling is dropped, ours already covers
both through the name target. #3974's scaling test module is kept
next to editor_tests.
- All 20 i18n catalogs: both sides appended rows at the end; kept both,
exact duplicates dropped, dupscan reports 0 problems.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
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>
A layer keeps its own XMP packet (Layer::xmp), where scripts and embedding
apps store data about the layer under their own namespaces.
- PSD/PSB/layered TIFF: read from and written to shmd > cust > layerXMP
(UTF-16, NUL-terminated, after layerTime), laid out as Photoshop 2026
writes it; an unchanged Photoshop block round-trips byte for byte.
- .pcraft: optional `xmp` on each layer.
- layer.xmpMetadata {layer?, rawData?}: read, set (one undo step) or
remove with null; refuses malformed XML, DTDs, NUL and > 4 MiB.
- Duplicate Layer copies the packet; document.inspect reports hasXmp.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts:
- commands.rs: layer.duplicate keeps the "Add copy" option; main's #5880
dropped the second damage pass (`before` and note_insert) for single
duplicates, so the clone of the document goes away too.
- jobs.rs: the success arm runs main's relayout damage first, then our
Expand New Effects disclosure update.
- panels.rs: the Background no longer loads a transparency selection on a
thumbnail click (main), and a thumbnail size of None has no thumbnail to
click (ours); main's `pos` / `on_thumb` now come before layer.select, so
the size guard moved there.
- 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>
A set built from the bindings dropped action keys from the main shortcuts but copied them from
the alternates, and applying a set replaced the alternates wholesale, dropping an action's
alternate key. Both now treat alternates like the main shortcuts.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>