Commit Graph
11425 Commits
Author SHA1 Message Date
David Mann e952e49f0c Merge remote-tracking branch 'origin/main' into fix/flip-angle-gradient-sweep 2026-10-27 14:16:03 +01:00
David Mann 79db3ba60d Merge remote-tracking branch 'origin/main' into fix/crop-x-ratio-keeps-size 2026-10-27 14:15:55 +01:00
David Mann 249b36af8b Merge remote-tracking branch 'origin/main' into fix/crop-swap-button-turns-frame 2026-10-27 14:15:47 +01:00
David Mann 94798e936f Merge remote-tracking branch 'origin/main' into fix/crop-straighten-snap 2026-10-27 14:15:38 +01:00
David Mann 8e8e6b1aaa Merge remote-tracking branch 'origin/main' into fix/crop-shift-letter-keys 2026-10-27 14:15:31 +01:00
David Mann f0e413139e Merge remote-tracking branch 'origin/main' into fix/crop-history-jump 2026-10-27 14:15:24 +01:00
David Mann 80a2fdef92 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/io/src/smart_map.rs
2026-10-27 14:15:23 +01:00
David Mann 6275e68020 Merge remote-tracking branch 'origin/main' into fix/crop-hidden-resample-budget 2026-10-27 14:15:17 +01:00
David Mann 8f0e03ff5d Merge remote-tracking branch 'origin/main' into fix/crop-drag-tool-switch 2026-10-27 14:15:07 +01:00
David Mann 69eb232c95 Merge remote-tracking branch 'origin/main' into fix/crop-drag-autoscroll 2026-10-27 14:15:00 +01:00
David Mann 9ebba353c8 Merge remote-tracking branch 'origin/main' into fix/crop-doc-switch-view-turn 2026-10-27 14:14:52 +01:00
David Mann da811c4b06 Merge remote-tracking branch 'origin/main' into fix/crop-click-snap 2026-10-27 14:14:45 +01:00
David Mann f3a46ec2b1 Merge remote-tracking branch 'origin/main' into fix/color-wheel-short-panel 2026-10-27 14:14:37 +01:00
David Mann 18494f8afd Merge remote-tracking branch 'origin/main' into fix/cmyk-clip-vivid-light-group 2026-10-27 14:14:29 +01:00
David Mann 3cc145f754 Merge remote-tracking branch 'origin/main' into fix/9275-crop-esc-mid-drag 2026-10-27 14:14:21 +01:00
David Mann 356c766d5b Merge remote-tracking branch 'origin/main' into fix/9034-autosave-discard 2026-10-27 14:14:13 +01:00
David Mann 9043f65a08 Merge remote-tracking branch 'origin/main' into fix/5692-tsl-off-blend 2026-10-27 14:14:05 +01:00
David Mann 64550db7c8 Merge remote-tracking branch 'origin/main' into feat/auto-219-8-panel-command-check 2026-10-27 14:13:58 +01:00
David Mann 89489082cc Merge PR #8923: fix(ui): Remove Tool trail tints all a stroke removes; brush trails follow hardness (#8916) 2026-10-27 14:01:28 +01:00
David Mann 8534e877dc Merge PR #9450: raw: AHD demosaic with reused planar scratch, about 1.6x fewer instructions 2026-10-27 13:58:31 +01:00
ac9b374fab Integration: Remove trail shows thin strokes on big documents (#8923)
The trail mask is at most 1024 px on its long side, so on a big document
one mask pixel stands for k x k document pixels, and the Remove trail
sampled only each block's centre. A thin stroke that fell between the
centres (2 px on 6000x4000, k = 6; 4 px on 12000x8000, k = 12) showed no
tint at all, though every pixel it touched is removed. In reach mode a
mask pixel now takes the largest coverage of its whole block, clipped to
the document. Blocks no coverage tile reaches are skipped
(StrokeRenderer::touches), so releasing a whole stroke on a 30000x20000
document restamps in 0.22 s instead of 23 s.

Also pins the waiting strokes' kept tint where a later stroke restamps
its rectangle off its own path (fails with the base max removed).

Co-authored-by: Hartmut Nörenberg <55043719+hnoerenberg@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 13:57:20 +01:00
Khawar Zamman Wani cc6837355b perf(paint): accumulate serial dabs in place with packed tile keys 2026-10-27 18:26:47 +05:30
David Mann 281f8e95f5 Merge PR #8704: fix(codecs): check header dimensions against the file size before allocating 2026-10-27 13:52:36 +01:00
David Mann c14a707d2a Merge PR #6583: PSD/PSB open without reading the whole file: channel data read as decoded, in bands into tiles (#5106)
Merged at the fix-up commit before its main merge (362947695d); the
conflicts with the batch are resolved here: psd_import.rs keeps both
sides' tests, tiff_layers.rs takes ImageData::new.
2026-10-27 13:50:37 +01:00
c65b7d93d6 Integration: file-size bound fits DWA EXR, RLE BMP and GIF screens (#8704)
The new plausibility check refused valid files that main opens:
- EXR DWAA/DWAB parts: they go past 2^16:1 (a flat 8192x4320 DWAB frame
  with 12 alpha-scheme mattes is 29,948 bytes, 75,629:1; run-length
  channels zlib-packed on top reach about 132,000:1). DWA parts now get
  2^18:1, so a header of a few hundred bytes can ask for about 100 MB,
  not gigabytes.
- BMP RLE8/RLE4: end-of-line, end-of-bitmap and delta escapes leave pixels
  unwritten, so no ratio bounds a valid file (an EOB-only 4000x4000 RLE8 is
  1,080 bytes). Skipped like HDR.
- GIF: the decoder's size is the logical screen, which needs no data (a
  4000x4000 screen with a 1x1 frame is 35 bytes). The first frame must be
  backed, and the screen only past 256 MiB, so a 35-byte GIF still can't
  declare a 30000x30000 screen.
The declared-size products saturate: a Radiance header of 2^31 x 2^31
read without limits overflowed u64 in debug builds.

Co-authored-by: FinnNk <1424666+FinnNk@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 13:46:11 +01:00
Khawar Zamman Wani 47df5dedea perf(paint): cache round-tip geometry per dab 2026-10-27 18:10:05 +05:30
362947695d Integration: a source read error in the layer records fails the open (#6583)
The lazy parse took any error from read_layer_info on a Layr/Lr16/Lr32
global block as a damaged block and dropped the layers. A failed read of
the source (PsdError::Read: a dropped network share, a file rewritten
while it opens) then let a 16/32-bit layered file open silently from its
merged image, with no damage warning, and a save replaced its layers.
A read error now fails the parse, as reading the whole file would.

The new test fails each read of a clean parse once, in turn, and checks
the parse either fails with the read error or matches from_bytes; with
the fix reverted, read 20 of the Lr16 sample drops the layers silently.

Found by CodeRabbit's review of the PR.

Co-authored-by: ptrinh <774083+ptrinh@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 13:28:32 +01:00
041aac9ecb Integration: folder batches skip raws that open only as the preview (#9097)
Listing every photocraft_raw extension also picked up CR3, ORF, RAF, RW2,
SRF and SR2. The raw decoder can't read CR3, compressed ORF and RAF, or RW2
raw formats other than 3, 4 and 5 yet; import then falls back to the
embedded JPEG preview with only a warning, so a folder batch would process
the thumbnail silently. The folder list now takes the raws whose usual files
decode (DNG, CR2, NEF, NRW, ARW, PEF), and the test pins both sides.

Port of the reviewed fix-up 202ce9c2a (davidmann4/photocraft pr-9097-fixup)
to this batch's file layout: same changed lines, in file_cmds.rs instead of
main's later file_cmds/paths.rs split.

Co-authored-by: .CooCoo <1206598+dotCooCoo@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 13:28:27 +01:00
David Mann f35e2307de Merge PR #9097: Batch: folder sources take every format PhotoCraft opens 2026-10-27 13:27:35 +01:00
Jeremy 6599f6dbd2 docs(installer): say that silent installs are per-user and when the scope page appears 2026-10-27 12:26:56 +00:00
Jeremy e51f604ea4 docs(installer): note that the 32-bit all-users folder is Program Files (x86); tidy wording 2026-10-27 12:25:20 +00:00
Brennan StehlingandClaude Opus 5.5 95fb59dd28 Render path tests: on the GPU canvas includes a software adapter's reason (#9328)
CI's runners have software adapters, which record SoftwareAdapter for the whole window while the
GPU canvas runs. The flipped-view and over-budget tests now check that state with on_gpu_canvas
instead of expecting no reason at all. Checked locally with the adapter faked as a CPU device.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 05:25:10 -07:00
Kaedo17 712b0fb892 fix: dismiss context menu without triggering tool action on outside click
When a canvas tool menu (Zoom/Hand view menu, selection menu, etc.) is open
and the user clicks outside it to dismiss it, that click should not also
trigger the underlying tool action (e.g., zoom step). This matches Photoshop
behavior where the dismissal click is consumed.

Fixes #9832

**Changes:**
- Added  flag to  to track when an outside press dismisses the menu
- Set flag in  when  returns true
- Added  function using actual rendered menu rect from egui's area memory
- In click handler: check dismissed flag first (consume release click), then use accurate menu rect for hit-test

**Testing:**
- All existing tests pass (canvas_tool_menu, zoom_tool, etc.): 60 passed
- clippy passes
- cargo xtask layers passes
- cargo xtask wasm passes
- panic_hunt test passes
2026-10-27 20:16:01 +08:00
David Mann f811db8f65 Merge PR #9321: feat: type on a path follows its path when the path is edited (#9114) 2026-10-27 13:12:53 +01:00
Jeremy 94e13c9e6f docs(installer): describe the per-user default install location and scope 2026-10-27 12:09:03 +00:00
Jeremy bf4e8214fc fix(installer): correct the wizard and shortcut description in the release docs; harden install-policy checks 2026-10-27 12:01:33 +00:00
Jeremy f35b356f87 fix(installer): address scope and ARM64 review feedback 2026-10-27 12:01:33 +00:00
Jeremy c19d201748 feat(installer): default to a per-user ArtCraft folder 2026-10-27 12:01:33 +00:00
Jeremy 9956352be0 packaging(windows): dual-scope MSI, per-user by default, under the ArtCraft suite folder
Microsoft "Single Package Authoring": Package/Scope="perUserOrMachine"
writes ALLUSERS=2 and MSIINSTALLPERUSER=1, so the package installs
per-user by default (no UAC prompt) into %LOCALAPPDATA%\Programs\ArtCraftPhotoCraft (Windows Installer redirects the ProgramFiles folder in a
per-user install), and per-machine into Program Files\ArtCraft\PhotoCraft
through the setup wizard's "Install for all users" box or msiexec
ALLUSERS=1. Registry follows the context automatically: HKMU writes HKCU
per-user and HKLM per-machine, HKCR classes land in HKCU\Software\Classes
per-user, and components are keyed on registry values (ICE38).

Upgrades update the copy registered in the same context: the remembered
InstallDir is read from HKLM and HKCU separately, and installing in the
other context while a copy already exists is stopped with a message naming
the fix rather than creating a silent duplicate. The existing UpgradeCode,
ProductCode behaviour and per-machine upgrades are unchanged.

The Start Menu shortcut becomes non-advertised in its own component (an
advertised shortcut must target its component keypath, which is now a
registry value), as the ArtCraft Launcher's MSI already does.

Built and checked with WiX 5.0.2: full ICE validation and ICE50 pass, and
the built package's Property table, launch conditions, directory chain and
registry roots were read back from the MSI.
2026-10-27 12:01:33 +00:00
Kaedo17 20583b38ef fix: dismiss context menu without triggering tool action on outside click
When a canvas tool menu (Zoom/Hand view menu, selection menu, etc.) is open
and the user clicks outside it to dismiss it, that click should not also
trigger the underlying tool action (e.g., zoom step). This matches Photoshop
behavior where the dismissal click is consumed.

Fixes #9832
2026-10-27 19:56:01 +08:00
Khawar Zamman Wani 325421a28b perf(paint): keep rotated circular tips on the round fast path 2026-10-27 17:20:39 +05:30
Brennan StehlingandClaude Opus 5.5 c38281100a Render path: a document's own reason comes before a software adapter's (#9328)
A software adapter still runs the GPU canvas, so a document that left even that (over the
texture budget, a compositor that failed to build) now names its own reason; the other documents
keep the adapter's. CI's runners have software adapters, where the adapter's reason hid the
document's since 517eb6f2e. Reasons that leave no GPU canvas (CPU mode, a lost device) still come
first.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 04:49:21 -07:00
jonathanwxh-cell f97eb2849a Merge upstream main and resolve custom shape import conflicts
Preserve CSH import behavior, inline-data authorization policy, localization and regression tests while retaining upstream module extraction.

Local verification: formatting and independent static review passed. Parser/engine/automation/UI runtime, broader Clippy, WASM and visual gates remain incomplete locally because of resource limits. Hosted CI must establish remaining gates; this commit does not claim the PR is ready to merge.
2026-10-27 19:47:58 +08:00
SofiaAFigueredoandClaude Sonnet 5.5 93c9a67534 Merge upstream main into fix/9631-remember-jpeg-options
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-27 08:44:21 -03:00
Davit MatchakhelidzeandClaude Opus 5.5 82ac54070c i18n(ka): bring the Georgian catalog up to date
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YMTAbGNRxnMEzRvYnQGphF
2026-10-27 15:43:05 +04:00
Davit Matchakhelidze 46f4e6ef59 Merge upstream main into ka-language 2026-10-27 15:43:01 +04:00
vngocvan f8763e2d5a Fix Crop Clear retaining custom proportions 2026-10-27 18:38:32 +07:00
jonathanwxh-cell 8286677a1f Merge upstream main and resolve conflicts for PR #6169
Preserve the PR's intended behavior and regressions while retaining upstream module extraction and changes. Formatting and independent static review passed.

Local verification: 247 text tests passed (5 ignored), including reordered duplicate-font metadata regressions. Clippy and WASM did not start because the local disk safety threshold was reached.

Local UI verification is incomplete. Hosted CI must establish the remaining gates; this commit does not claim the PR is ready to merge.
2026-10-27 19:37:33 +08:00
jonathanwxh-cell 56ef54cf4c Merge upstream main and resolve conflicts for PR #7621
Preserve the PR's intended behavior and regressions while retaining upstream module extraction and changes. Formatting and independent static review passed.

Local verification: Runtime tests and broader Clippy/WASM/integration gates remain unverified locally because of resource limits.

Local UI verification is incomplete. Hosted CI must establish the remaining gates; this commit does not claim the PR is ready to merge.
2026-10-27 19:34:27 +08:00
NetterSilverandClaude Opus 5.5 90efa9a114 Add an export benchmark for .pcraft, PSD and flat formats
`cargo run --release -p photocraft-io --example bench_export` builds a
36 MP photo document (the opened photo, a painted layer, a soft
half-transparent layer) and times `photocraft_io::export` for .psd,
.pcraft (with and without the per-document export cache the app's Save
uses), TIFF, PNG and JPEG: median and min of --reps runs. --out DIR
writes each format's bytes so two builds' output can be compared.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 12:29:59 +01:00