Commit Graph
3891 Commits
Author SHA1 Message Date
aiongg 1dc684a2b6 Integration: track t09
# Conflicts:
#	contributors/people.toml
#	crates/engine/src/atn_cmds/tests.rs
#	crates/engine/src/file_cmds.rs
#	crates/engine/src/jobs.rs
#	docs/gaps.md
#	docs/target-app-parity.md
2026-10-22 15:38:26 +00:00
Ratul Paul 8730bd14cc Merge upstream main and retain contributor entries
Keep all upstream contributor records and append the existing Ratul entry.
Preserve UI scale presets, catalogs, tests, documentation and coauthor credit.

Validation: fmt, locked engine/UI tests (5685 passed), Clippy, layers, wasm,
scorecard generation/check, and panic_hunt all passed.
2026-10-22 21:38:23 +06:00
aiongg f72c3c2187 Integration: track t08
# Conflicts:
#	crates/ui-egui/src/camera_raw_ui.rs
#	crates/ui-egui/src/jobs_ui.rs
#	crates/ui-egui/src/widgets.rs
#	docs/file-format-parity.md
#	docs/gaps.md
2026-10-22 15:38:23 +00:00
aiongg 446b74a8de Integration: track t07
# Conflicts:
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
#	crates/ui-egui/src/layer_shortcut_tests.rs
2026-10-22 15:38:21 +00:00
aiongg ba120dc48e Integration: track t06
# Conflicts:
#	ROADMAP.md
#	crates/ui-egui/src/i18n/tr.tsv
#	docs/gaps.md
#	docs/ui-parity.md
2026-10-22 15:38:19 +00:00
aiongg 9c7cc91f82 Integration: track t05
# Conflicts:
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/shortcuts.rs
#	docs/ui-parity.md
2026-10-22 15:38:18 +00:00
aiongg 1f0177f23c Integration: track t04
# Conflicts:
#	ATTRIBUTION.md
#	contributors/people.toml
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
#	docs/gaps.md
2026-10-22 15:38:17 +00:00
aiongg 4d1b922ddf Integration: track t02
# Conflicts:
#	contributors/people.toml
#	crates/engine/src/file_cmds/tests.rs
#	crates/engine/src/print_cmds/tests.rs
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
2026-10-22 15:38:14 +00:00
aiongg 82cf3c828c Integration: track t01
# Conflicts:
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
#	docs/file-format-parity.md
#	docs/gaps.md
2026-10-22 15:38:14 +00:00
aiongg 0e80156397 Integration: track t16
Resolutions: CLI usage, flag lists and flag parsing carry both --tiff-compression (t15) and
--jpeg-format (t16); file.saveACopy, batch, imageProcessor and layersToFiles param specs carry
both tiffCompression and jpegFormat; file_cmds keeps tiff_compression_param and
jpeg_format_param; atn_cmds keeps flag_set/applies_at_canvas_bounds (t15) and UNHOLDABLE (t16),
edit.transform uses the pixel_target guard (t15) with layer_ref(p)? (t16); ui-egui open paths
build ImportOptions (t16) and apply raw_defaults (t15); docs headers/rows unioned; atn tests keep
both sides; tr.tsv "Keep Using CPU" kept once.
2026-10-22 15:38:13 +00:00
aiongg 3d1a4d6679 Integration: track t15
# Conflicts:
#	crates/engine/src/atn_cmds/tests.rs
#	crates/ui-egui/src/i18n/cs.tsv
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/hu.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
#	docs/file-format-parity.md
#	docs/ui-parity.md
2026-10-22 15:38:12 +00:00
aiongg 3db630feb4 Merge PR #8029: Snapping: artboard edges and centres are snap targets (#8016)
crates/engine/src/snap.rs: the PR's artboard branch kept, with main's target_rect_of(doc, l) signature in the following branch.
2026-10-22 15:37:48 +00:00
aiongg 40587f17e9 Merge PR #8219: Color Lookup lists the LUTs in a Preferences folder (#6558)
crates/ui-egui/Cargo.toml: kept main's photocraft-psd dev-dependency (testgen feature) and added the PR's tempfile dev-dependency
docs/scorecard.md: ours
2026-10-22 15:37:41 +00:00
aiongg 15a2ac3456 Merge PR #8158: fix(swatches): a CMYK swatch keeps its inks as the foreground (#7474) 2026-10-22 15:37:40 +00:00
aiongg bf34ae5006 Merge PR #8155: fix(info): Info panel CMYK uses the Color Picker's colour-managed conversion (#8101) 2026-10-22 15:37:40 +00:00
aiongg 9172ad7525 Merge PR #7215: Corrective Camera Raw - fix(import/camera-raw): preserve document identity across asynchronous opens and re-develop 2026-10-22 15:37:37 +00:00
aiongg d1cd1387a1 Integration: fix the two merged tests that no longer compile against main (StrokeFx overprint, per-tool Sample All Layers) 2026-10-22 15:37:35 +00:00
aiongg 8ac5ae11ec Merge PR #8245: fix(engine): Remove Background looks for the subject in the layer, not the canvas (#8235) 2026-10-22 15:37:33 +00:00
aiongg 05b0ae05e4 Merge PR #6896: fix: detect dominant foregrounds with Object Finder
docs/gaps.md: header and change-log row once each (the PR's row on top).
docs/ui-parity.md: header and change-log row once each; the Selection row keeps main's #6549 sentence and adds the PR's #6548 sentence.
2026-10-22 15:37:31 +00:00
aiongg 7e3517c090 Merge PR #6835: Object Finder: hovering with an empty active layer shows the status-bar hint (#6549) 2026-10-22 15:37:30 +00:00
aiongg a1d23fd2a6 Merge PR #6484: Shapes: the Color panel, Swatches and Gradients fill the selected shape (#5568)
crates/engine/src/presets/tests.rs: tests appended by both sides, kept whole (the PR's before main's persistence sections).
crates/ui-egui/src/swatches_ui.rs: tests appended by both sides, kept whole.
2026-10-22 15:37:30 +00:00
aiongg 26dbd7953b Merge PR #5834: Shapes: rounded corners on live triangles, polygons and stars (TOOL-214-12)
docs/scorecard.md: ours (regenerated at combine).
docs/ui-parity.md: kept main's header and added the PR's change entry once.
2026-10-22 15:37:29 +00:00
aiongg 7654482fd1 Merge PR #3330: Moving a shape keeps its rendering: Artboards to Files matches the reference app
crates/engine/src/layer_multi_cmds.rs: took the PR's call to shift_shape; main's added check that the moved path (plus stroke) stays inside the canvas moved into shift_shape (vector_cmds.rs) so both behaviours hold.
2026-10-22 15:37:29 +00:00
JGF e7d96d05dd Apply rustfmt's corpus fixture layout 2026-10-22 11:35:14 -04:00
JGF 3732cd614f Check exact property-event expansion in action corpus roundtrips
Preserve every property, target, action metadata field and expanded flag in the comparison. Add a synthetic regression that detects lost blend properties and flags; retain corpus floor and unsupported ceiling unchanged.
2026-10-22 11:29:15 -04:00
JGF 9cd2fd6154 Merge upstream main into compound action export fix
Preserve upstream byte-string dictionaries and all progress entries; retain separate property events and existing regression tests. Photoshop replay remains pending.
2026-10-22 11:09:32 -04:00
eiketre 0ef00d2b89 fix(ui): add transform handles for multi-layer selection 2026-10-22 17:09:13 +02:00
Arian100andClaude Opus 5.5 51cd9e1e8c test(atn): check an old BlnW Make keeps its settings; document adjustment_by_class
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 17:08:54 +02:00
midasdf 230e5aebe9 Print: take punctuation the paper-name contract covers
`normalize_paper` stripped only ASCII spaces, hyphens, underscores and
parentheses, so `B5(JIS)` and `JIS B5.` returned None even though
`paper_size` and `docs/printing.md` say names are punctuation-insensitive.
Map `×`/`*` to `x` first, then ignore ASCII punctuation and the full-width
parentheses, comma, full stop and Japanese full stop, so the documented
forms and the JIS aliases resolve alike.

Tests: the alias table gains `B5(JIS)` and `JIS B5` followed by an ASCII
or Japanese full stop.
2026-10-23 00:08:38 +09:00
1b642e0d64 Integration: merge the new head of #6658, resolve conflicts (#6658)
The author's dc1ced70 (doc comments; a layer with bounds but no channel
data now marks the import damaged) on top of our earlier fix-up. Only
conflict: io/src/lib.rs, where main's import_psd (#5258) sits next to
the new doc comment on import_stages; both kept.

Co-authored-by: DavidBonnier <4418006+DavidBonnier@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 17:01:31 +02:00
a5c70cb0ee Integration: merge main, resolve conflicts (#1199)
Main moved about 2100 commits since the branch's last merge. Resolved:
- smartselect_cmds.rs: main's empty-layer check for Object Selection
  (check_sampled_pixels, #5246) now runs before the SAM branch, which
  returned before it in a plain merge.
- cutout_cmds.rs: the classical path keeps main's cancellable stage;
  the BiRefNet path is unchanged.
- prefs_ui.rs: main split section_fields into field_visible/field_rows;
  the model labels, the filtered model choices and the options struct
  move into that structure.
- apps: main's trusted_local() CLI session, Linux print spooler and frame
  cap kept beside the local-model setup.
- channel_view.rs: main's version (#4915); the branch's change there was
  unrelated to local models.
- i18n, people.toml, SOURCES.md, architecture.md, gaps.md: both sides.
  Cargo.lock and docs/scorecard.md from main, then regenerated.

Co-authored-by: mighty-programmer <83077551+mighty-programmer@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 17:01:01 +02:00
sn-o-w 2576bd59f0 fix(zoom): Restore smooth wheel zoom 2026-10-22 17:38:29 +03:00
6f56a4d750 Integration: merge main, resolve conflicts (#5485)
Main moved about 1,860 commits since the PR's last merge. i18n catalogs keep both
sides' rows; control.rs keeps updatesOpen next to main's strokeTrace (39 fields);
Services keeps check_updates next to main's place_inbox; Cargo.lock is main's,
re-resolved for ureq and semver; docs/gaps.md, docs/target-app-parity.md and
docs/scorecard.md are main's (the PR's entries come back in the next commit).

Co-authored-by: ZhuanTou33212 <285931757+ZhuanTou33212@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 16:36:42 +02:00
Don OmondiandSkyfuller1303 39d270a5c3 Support embedded vector editing through regular desktop editors
Offer explicit external editing for embedded SVG, PDF-compatible AI, PDF and
EPS smart objects, with bounded conversion/rendering and transactional save-back
that retains placement, shared instances, masks, filters and undo history.

On Linux, export the checked writable working file through the desktop portal
so the regular VectorCraft instance handles it. Keep Flatpak working copies in
the app-private cache and release completed editor sessions after cancellation.
Do not execute another Flatpak's interactive payload inside PhotoCraft.

Adapt the credited SVG editor foundation from Skyfuller1303's 897f2007 without
its clipboard or unrelated Shape Tools changes. Add current-main compatibility,
embedded native-vector support, regression tests and authored screenshots.

Co-authored-by: Skyfuller1303 <skyfullerdesign@gmail.com>
2026-10-22 17:24:27 +03:00
aiongg 95e59a99c0 Format the quick export test (#8535) 2026-10-22 13:52:23 +00:00
Martin BallandClaude Opus 5.5 4bfeb7889d Fixes #8519 quick export honours extension (#8535)
* fix(engine): Quick Export writes the format its path names (#8519)

Quick Export as PNG renamed to photo.jpeg in the save dialog wrote PNG
bytes under a JPEG name, which upload checks refuse and file managers
don't preview. The path's extension (.jpg/.jpeg/.png/.gif/.webp) now picks
the format; any other extension is refused with a pointer to Export As;
no extension keeps Export Preferences' format.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

* contributors: add benandez's real name

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 09:28:42 -04:00
NetterSilverandClaude Haiku 5.5 1bdf5a602f Fix keyboard shortcut set names with '/' or '=' being truncated
Found while testing crates/engine/src/kys.rs:64 (parse; written by write at :285)

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-22 15:18:34 +02:00
fb598b25e8 Integration: merge main, resolve conflicts (#5598)
docs/scorecard.md conflicted with main (a generated file). Regenerated it
with cargo xtask scorecard on the merged tree: settings that do nothing
24 -> 23 of 171, plug_ins.generator_enabled leaves the Unread list.

Co-authored-by: reynold-hu <88558425+reynold-hu@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 15:14:10 +02:00
David Bonnier 8b2c722dc8 docs: add missing Rustdoc comments for PSD recovery 2026-10-22 15:03:32 +02:00
Arian100andClaude Opus 5.5 00d5a71313 fix(atn): export Black & White adjustment layers with Photoshop's BanW class (#8481)
A Make step for a Black & White adjustment layer was written with the
type class `BlnW`, which Photoshop refuses ("The command Make is not
currently available"), and Photoshop's own `BanW` Make imported as an
unsupported step. Export and import now use `BanW`; `BlnW` stays
accepted on import so actions saved by older PhotoCraft builds still load.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 13:41:29 +02:00
Dylan M. Taylor 5338f1de46 security: budget nested action playback and preserve batch auth 2026-10-22 07:12:21 -04:00
averaged 6de4b87d9d fix(engine): select files correctly in Windows Explorer 2026-10-22 19:12:01 +08:00
Dylan M. Taylor dc6057d3f2 security(engine): deduplicate ATN action names in near-linear time
actions.load gave each imported action a unique name with a helper that
restarted suffix numbering at 2 and linearly scanned all accepted names
for every candidate. A file repeating one base name many times caused
cubic comparison work during load.

Replace it with a UniqueNames helper backed by a HashSet for membership
and a per-base-name next-suffix cache, preserving the name, name 2,
name 3 ... sequence and first-match behavior.

Finding: 9c7a5fdb-131e-4687-8175-58d72007b0c5 (CWE-407)
2026-10-22 07:11:54 -04:00
Dylan M. Taylor ac7eca536a security(engine): convert spelling offsets in one pass
The spelling list converted each misspelling's start and end byte offset
to a character offset with char_at, which recounts the text prefix from
the start every call. A layer with many short misspellings therefore
caused quadratic rescanning on the synchronous UI thread.

Collect the ascending offsets and map them to character offsets in a
single forward walk over the text. char_at is removed (byte_at still
handles the reverse direction in change()).

Finding: 392eb136-b836-4400-8ed7-f1e4549ff0ae (CWE-407)
2026-10-22 07:11:41 -04:00
Dylan M. Taylor 2c02d06392 security(engine): count GIF frame delays with a map
fps_from_delays counted each frame's delay by scanning a growing vector
with iter_mut().find(), O(n^2) for a GIF with many distinct delays. A
crafted animation within the frame limit could stall the synchronous
import path.

Count delays in a HashMap and keep a first-seen order vector so the
most-common delay still wins, breaking ties toward the earliest-seen
delay exactly as before.

Finding: 23d54421-8e26-41b9-9690-ae1125ee2f85 (CWE-407)
2026-10-22 07:11:37 -04:00
07911e77f4 Integration: merge main, resolve conflicts (#6658)
main moved the PSD branch of import_stages into import_psd (two call sites,
#5258) and added the font wait after warm_layer_bounds (#7332). import_psd
now reports the damage flag through psd_to_document_decoded_integrity at both
call sites, and the font wait reads the document from the (result, damaged)
pair.

Co-authored-by: DavidBonnier <4418006+DavidBonnier@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 13:09:33 +02:00
justinjohn0306 c83a52b771 fix(atn): preserve unsupported event kinds 2026-10-22 16:06:32 +05:30
justinjohn0306 926b1bf9f7 fix(actions): accept Photoshop blend mode stringIDs 2026-10-22 15:40:13 +05:30
David MannandClaude Opus 5.5 7a54fa9c77 Integration: merge main into batch 6
Conflicts, both sides kept: main's .act swatches next to the batch's .asl
styles (Open filters, preset extensions), main's Render smart filters next
to the batch's Distort ones (53 mapped), parity doc status lines.
docs/scorecard.md regenerated.

Follow-ups the merge needed: the Distort smart filter readers pass their
enum type to main's stricter enum_name (the type their writers use), and
the CMYK effect tests set main's new StrokeFx overprint and Bevel
gloss_anti_alias.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 12:09:25 +02:00
David MannandClaude Opus 5.5 cd8f879666 Address CodeRabbit review: refuse a bent full cylinder warp, report path type errors
- edit.transform.warp with a full `warp` object of style cylinder now
  refuses `vertical`, `hDistort` or `vDistort` like the `style` path does,
  instead of silently rebuilding a plain horizontal cylinder (#5769).
- A click with the Type tool on a path shows type.fillPath or
  type.attachToPath errors in the status bar instead of dropping them (#6230).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 11:54:16 +02:00