Commit Graph
3891 Commits
Author SHA1 Message Date
aiongg 15df0acb04 Merge PR #4585: Prevent clipboard centering overflow and incorrect paste placement 2026-10-22 02:21:47 +00:00
aiongg 200206f56b Merge PR #4392: Layer Style: user contour library with New…, Load/Replace/Save Contours (#4391) 2026-10-22 02:21:46 +00:00
aiongg 3458eee861 Merge main into #3283
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).
2026-10-22 02:16:49 +00:00
Khawar Zamman WaniandClaude Opus 5.5 16a18881ee fix(vector): Merge Shape Components refuses open subpaths
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>
2026-10-22 07:32:05 +05:30
Khawar Zamman WaniandClaude Opus 5.5 b2f4cb56fb Merge remote-tracking branch 'origin/main' into fix/6501-multi-layer-free-transform
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>
2026-10-22 07:20:48 +05:30
Khawar Zamman WaniandClaude Opus 5.5 625f0d1233 Merge remote-tracking branch 'origin/main' into claude/blur-tool-lag-684245
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>
2026-10-22 06:59:03 +05:30
Khawar Zamman WaniandClaude Opus 5.5 93ea5c12da Merge remote-tracking branch 'origin/main' into save-for-web-webp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:54 +05:30
Khawar Zamman WaniandClaude Opus 5.5 85a1c26950 Merge remote-tracking branch 'origin/main' into pen-path-operations
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 06:28:28 +05:30
jonathnwxh 2ba33c4400 Merge main preserving document and View menu action mappings 2026-10-22 08:58:01 +08:00
Zuujis 38bc5e916c refactor(atn): build the clipping-mask and three adjustment events with macros (#8401)
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.
2026-10-21 20:28:12 -04:00
jonathanwxh-cell e7bf017502 Merge main into batch save-point fix, retaining both regression suites 2026-10-22 07:47:27 +08:00
aiongg ba40dffb25 Merge pull request #8355 from aiongg/integration-10
Integration batch: #8229, David's follow-ups and 85 FredApps-approved PRs on main
2026-10-21 19:02:54 -04:00
vangel76andClaude Sonnet 5.5 c53463344f Merge upstream/main into fix/3290-filter-mask-paint
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-22 00:46:37 +02:00
abc2cbandClaude Opus 5.5 a335b58e21 Merge upstream/main 43b14883 into the Smart Filters branch
#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>
2026-10-22 01:12:29 +03:00
aiongg f32f882f3a Merge main into integration-10
# Conflicts:
#	apps/photocraft-web/src/web.rs
#	apps/photocraft/src/services.rs
#	crates/engine/src/file_cmds/tests.rs
#	crates/engine/src/float_cmds.rs
#	crates/engine/src/float_cmds/tests.rs
#	xtask/src/corpus.rs
#	xtask/src/corpus_pins.rs
#	xtask/src/main.rs
2026-10-21 21:56:26 +00:00
aiongg 64d042aef5 Integration: Create Clipping Mask also maps the GrpL code and a named-layer target, for #6881 and #4496 2026-10-21 21:56:21 +00:00
aiongg 0e9cbbc88e Integration: one tools.setColors and one clipping-mask mapping in .atn export, for #6881 and #4496 2026-10-21 21:56:21 +00:00
aiongg 719fb44d42 Merge PR #6881: Actions: .atn Select Subject, Select and Mask, Color Range, clipping and layer masks, colours map to commands (part of #6745) 2026-10-21 21:56:21 +00:00
aiongg 43e9587590 Merge PR #6363: New Document: Color Profile, the working space or another profile of the mode (#321) 2026-10-21 21:56:21 +00:00
aiongg 29388de427 Merge PR #6919: Selections don't mark a document modified (#6865) 2026-10-21 21:56:21 +00:00
aiongg 403dc5043a Merge PR #8096: CodeRabbit follow-ups for the #8095 batch 2026-10-21 21:56:21 +00:00
aiongg 3b6fabb04a Merge PR #6801: Actions that start with Deselect play on when nothing is selected 2026-10-21 21:56:21 +00:00
aiongg a06c4639f6 Merge PR #5590: Warp: apply a large layer's warp in the background, with progress and Esc to cancel (#1015) 2026-10-21 21:56:21 +00:00
aiongg dd83f87d3c Merge PR #5581: Layers: Group Layers creates the group collapsed (#5571) 2026-10-21 21:56:20 +00:00
aiongg 5eada4996a Merge PR #7219: Actions: record File › Export › Export As and replay it with its settings (#7207) 2026-10-21 21:56:20 +00:00
aiongg b75f0cf21d Merge PR #7799: Displace on a Smart Object: the map is embedded in the smart filter, so it displaces (#7423) 2026-10-21 21:56:10 +00:00
aiongg b0833a893c Merge PR #7694: perf(format): reuse .pcraft writers between document saves 2026-10-21 21:56:10 +00:00
aiongg 5189019b5b Merge PR #7696: fix(actions): preserve effective Stroke width in ATN export 2026-10-21 21:56:10 +00:00
aiongg c2d5a3fd64 Merge PR #7708: fix(actions): refuse lossy fractional Ripple ATN export 2026-10-21 21:56:10 +00:00
aiongg 6695bd5a8b Merge PR #8005: Open: a file without type never waits for the font scan (#7332) 2026-10-21 21:56:10 +00:00
aiongg 3a7180cf8c Merge PR #6509: Type: commit the edit when another layer or document becomes active (#6483) 2026-10-21 21:55:49 +00:00
aiongg 5ef5c71164 Merge PR #6912: Shortcuts: custom bindings on PageUp/PageDown (and other multi-word keys) fire again (#6827) 2026-10-21 21:55:49 +00:00
aiongg e09bf5728f Merge PR #7784: Actions: a background filter's step is recorded only by the recording it started in (#7289) 2026-10-21 21:55:49 +00:00
aiongg 97a1a67f38 Merge PR #7959: Actions: Emboss saves to and loads from .atn as Photoshop's Embs step (#7946) 2026-10-21 21:55:49 +00:00
aiongg f0137c6ace Merge PR #7963: Fix File Info showing 1/1 s for exposures just under one second 2026-10-21 21:55:49 +00:00
aiongg 38f684e4e4 Merge PR #7661: Move tool: a selection lifts up to a pixel's own coverage (#7655) 2026-10-21 21:55:49 +00:00
David Mann 47b6df156e Merge PR #4049: feat(styles): import and export .asl layer style libraries (#1051)
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.
2026-10-21 23:51:04 +02:00
David Mann a8f91f54ad Merge PR #6230: feat(type): area type, text that wraps inside a closed path or shape
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.
2026-10-21 23:46:05 +02:00
David Mann fa71e04f10 Merge PR #5769: PSD smart objects: keep Photoshop's Cylinder warp when re-rendered (#4112)
Integration: resolve docs conflicts (file-format-parity, gaps status lines) with main
2026-10-21 23:24:11 +02:00
David Mann 2c625d986f Merge PR #7838: Free Transform: a result may take what Memory Usage allows, not 2^30 px (#7807) 2026-10-21 23:23:13 +02:00
abc2cbandClaude Opus 5.5 6da0673cd1 Merge upstream/main 6d8cbac7 into the Smart Filters branch
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>
2026-10-22 00:14:11 +03:00
abc2cbandClaude Opus 5.5 ff5708361d Merge the Layers Panel flyout branch (upstream/main 6d8cbac7 merged) into the Fill layers branch
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>
2026-10-22 00:12:09 +03:00
abc2cbandClaude Opus 5.5 743a38e64d Layers panel reorder: Content-Aware Move preview wins, moveTo drops asserted
- 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>
2026-10-22 00:09:58 +03:00
bommerts d1c30954aa Fix compound layer property exports for Photoshop actions 2026-10-21 17:08:17 -04:00
David Bonnier d1c1d8819f refactor: confirm damaged PSD opens without restricting saves 2026-10-21 23:06:20 +02:00
David Bonnier aa1a77b9da fix(io/ui): allow explicit PSD recovery with non-overwriting Save a Copy 2026-10-21 23:06:19 +02:00
Tom InglingandClaude Opus 5.5 052c1c3ab7 Layers: per-layer XMP metadata, as Photoshop's layer.xmpMetadata
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>
2026-10-21 17:03:02 -04:00
abc2cbandClaude Opus 5.5 8cc64b86a1 Merge upstream/main 6d8cbac7 into the Layers Panel flyout branch
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>
2026-10-21 23:57:52 +03:00
David Mann dd695a7cfb Merge remote-tracking branch 'origin/main' into HEAD 2026-10-21 22:54:34 +02:00
David MannandClaude Opus 5.5 8097063c46 Address CodeRabbit review: shortcut sets leave action alternate keys to the action
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>
2026-10-21 22:54:34 +02:00