Commit Graph
129 Commits
Author SHA1 Message Date
FredApps 0f120bbda1 Merge current main, reconcile streamed PNG profiles and workflow inputs 2026-10-30 06:52:05 +01:00
FredApps 7c05ffe243 Keep packed-key overlap expression within repository formatting style 2026-10-29 14:41:10 +01:00
FredApps f72b2ccab1 Reconcile stroke touches with packed coverage tile keys
Preserve both sparse and bounded-rectangle overlap paths after integrating #9852 with current main. Existing touches_covers_every_pixel_with_coverage covers negative coordinates, edges and huge rectangles. Combined CI will validate; no local build claimed.
2026-10-29 14:40:31 +01:00
FredApps 53dbfe280c Integrate 16 reviewed performance and usability PRs
Includes #8472 #8488 #9461 #9793 #9809 #9813 #9814 #9822 #9826 #9847 #9850 #9852 #9921 #9924 #9961 #10080 at reviewed heads.

Preserves each PR head as a parent. Reconciles CI workflow inputs and benchmark jobs without dropping checks. Excludes #8536 #9825 #9969 #10129. Combined CI pending; no manual validation claimed.
2026-10-29 14:31:15 +01:00
FredApps 32f583f1d6 Merge approved PhotoCraft PR #5082: fix(mixer-brush): Alt-click samples the foreground colour like the Brush (#4873)
Port behavior and regression coverage into current modules; preserve current upstream behavior.
Preserve current spatial Mixer Brush Alt-click sampling and live transaction architecture; add compatible point-sample command without foreground mutation. Retain sample across automatic reload until foreground changes and preserve all new regressions.
2026-10-29 06:05:02 +01:00
FredApps a72296ee57 Merge approved PhotoCraft PR #6139: Fix painting workflows, File Info and layer selection
Port behavior and regression coverage into current modules; preserve current upstream behavior.
Ported Behind paint across engine/render and shared options-bar/canvas mode menus, preserving Clear and current popup ownership. Added localized responsive picker title/width and File Info multiline fields without dropping ordered fields, Browse or camera metadata; ported Pen anchor repositioning, copy cursor, grayscale-target sampling and authorized select-under-cursor dispatch into current modules with original regressions.
2026-10-29 05:39:00 +01:00
FredApps d24410da75 Merge approved PhotoCraft PR #9623: Pencil: keep a 1 px freehand line connected where it turns 2026-10-29 03:30:04 +01:00
Khawar Zamman Wani 5f03f1424b perf(paint): skip dry mixer canvas sampling 2026-10-28 08:09:49 +05:30
Dylan M. Taylor 2b0b11848c Refactor paint for strict Clippy checks 2026-10-27 23:47:06 +00:00
David Mann 3a689f217c Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/file_cmds.rs
#	crates/engine/src/retouch_cmds.rs
#	crates/engine/src/vector_cmds.rs
#	crates/io/src/psd_export.rs
#	crates/io/src/psd_import.rs
#	crates/io/src/smart_map.rs
#	crates/psd/src/layer.rs
#	crates/raster/src/lib.rs
#	crates/ui-egui/src/camera_raw_ui.rs
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/filter_dialog.rs
#	crates/ui-egui/src/gpu_canvas.rs
#	crates/ui-egui/src/panels.rs
#	crates/ui-egui/src/retouch_ui.rs
#	crates/ui-egui/src/transform_tool.rs
#	crates/ui-egui/src/vector_ui.rs
#	docs/gaps.md
2026-10-27 14:26:26 +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
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
Khawar Zamman Wani 47df5dedea perf(paint): cache round-tip geometry per dab 2026-10-27 18:10:05 +05:30
Khawar Zamman Wani 325421a28b perf(paint): keep rotated circular tips on the round fast path 2026-10-27 17:20:39 +05:30
aiongg b3a8bf65b1 refactor(paint): move render_reference.rs to render/reference.rs 2026-10-26 22:30:14 +00:00
aiongg ffd8333999 refactor(paint): move mixer_reference_tests.rs to mixer/reference_tests.rs 2026-10-26 22:30:14 +00:00
NetterSilverandClaude Opus 5.5 652075f4da Pencil: keep a 1 px freehand line connected where it turns
Fixes #8040

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 07:57:16 +01:00
Dylan M. Taylor d3b0a76c3f lint: drop blank lines after doc comments and attributes; tidy IME else, closure, shell tests (#9576)
- Remove blank lines between doc comments or #[test] attributes and the item (S8855, S8856)
- type_tool: drop the redundant else after continue in the IME event arm (S8862)
- ui_state: pass OsStr::to_os_string instead of an equivalent closure (S1612)
- macos packaging: [[ ]] for the attempt test (S7688); bind validate_staple's argument to a local (S7679)
2026-10-25 22:08:50 -04:00
David MannandClaude Opus 5.5 ca046c72de Merge PR #8846: Fix stacked brush-tip artifacts in hard-round presets
Docs: status lines and revision rows kept from both sides.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-25 15:02:35 +01:00
David Mann d576113233 Merge PR #3627: Mixer Brush: render mixed paint during the stroke and commit the live result
# Conflicts:
#	crates/engine/src/float_cmds.rs
2026-10-25 14:29:47 +01:00
David MannandClaude Opus 5.5 2415c6979f Integration: merge main, resolve conflicts (#3627)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 13:00:08 +01:00
David Mann d5e56b03e1 Merge PR #7218: Brush: large tips rasterize, accumulate and composite in parallel 2026-10-25 10:14:11 +01:00
aiongg 360150dcd4 Merge pull request #7281 from wanikhawar/claude/blur-tool-lag-684245
perf(retouch): releasing a Blur/Smudge/Dodge stroke takes its live pixels
2026-10-24 11:13:32 -04:00
Khawar Zamman Wani f01e2dd9c8 Merge remote-tracking branch 'origin/main' into fix/8842-hard-round-spacing 2026-10-24 12:10:25 +05:30
Omar SaidahmedandBrandon Thomas afd5127dc8 perf: skip redundant smart object resamples and per-pixel reads (#6406)
* skip redundant smart object resamples and per-pixel reads

* resample smart objects only when their re-render fails

---------

Co-authored-by: Brandon Thomas <echelon@gmail.com>
2026-10-23 18:36:54 -04:00
Dylan M. Taylor cfd894aad3 security(paint): cap spaced steps and procedural primitives (#8957)
* security(paint): cap distance-spaced steps per segment and procedural tip primitives

* test(paint): count steps through a Cell so the walker closure can be shared

* paint: keep the spacing carry-over when a segment ends at the step cap; lower the tip work budget
2026-10-23 17:38:07 -04:00
Dylan M. TaylorandCodebuff 56d7009c78 fix(paint): validate gray tile dimensions safely (#8772)
* fix(paint): check tile dimensions before allocation math

Reject overflowing tile dimensions during deserialization and treat invalid in-memory tiles as empty safe previews and mipmaps.

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>

* test(tile): assert the address-space overflow error on 32-bit targets

---------

Co-authored-by: Codebuff <noreply@codebuff.com>
2026-10-23 09:27:54 -04:00
Khawar Zamman Wani 4cfc219dfb fix(paint): smooth hard-round preset strokes (#8842) 2026-10-23 16:50:08 +05:30
durtyrobbin 5bd07b07ed Address mixer review: safe sampling, shared live commits and preserved brush behavior 2026-10-22 14:41:04 -04:00
360e0920fc Integration: parallel brush composite keeps the document's CMYK profile (#7218)
The document's CMYK profile is active per thread (with_cmyk_space), and the
parallel composite ran its tiles on rayon workers outside that scope. On a
CMYK document with its own profile, every blend mode other than Normal and
Dissolve then converted those tiles through the built-in coated CMYK: a 40 px
Multiply line 1100 px long (17+ tiles, parallel at the default threshold)
differed from the serial path in 256384 samples. The workers now enter the
caller's CMYK space, as the compositor and gpu crates do.

Test: a_parallel_composite_converts_through_the_documents_cmyk_profile fails
without the fix.

Co-authored-by: Unemars <62496697+Unemars@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 20:31:34 +02:00
durtyrobbin 3233e2ffc9 Merge main while preserving live mixer controls and review fixes 2026-10-22 14:00:00 -04:00
durtyrobbin 6d8870157a Merge main while retaining live mixer behavior and regression coverage 2026-10-22 12:32:26 -04:00
skylar taylor-barrick 0635061b86 fix(retouch): preserve Smudge pickup through live stroke release 2026-10-22 08:16:51 +05:30
aiongg c08a6ad9cf Merge PR #5317: Brush Pose: preserve independent Tilt X/Y overrides
crates/paint/src/brush_tests.rs: both sides added tests at the same spot; kept main's four smoothing tests and added the PR's three pose_axes tests after them.
docs/brush-parity.md: kept main's header and added the PR's change item.
docs/gaps.md: kept main's header, added the PR's change item; G4 progress notes and the change-log row kept from both sides.
docs/control-protocol.md: kept main's eyedropper line (with the document.sampleColor wording) and added the PR's Brush Pose line before it.
2026-10-22 02:22:51 +00:00
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
aiongg fa5a06de4f Merge PR #8053: Pencil: align 1 px click snapping with the line walker (#4895) 2026-10-21 21:56:11 +00:00
UnemarsandClaude Opus 5.5 8c5ec444db Brush test: the parallel threshold goes back to its default however the test ends
The parallel-vs-serial test moved the process-wide threshold and restored a
hard-coded 256² only on success. A drop guard now restores it on every exit
path, a panic inside a render included, from the renderer's own
`DEFAULT_PARALLEL_MIN_PIXELS` instead of a copy of the literal.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 19:43:02 +02:00
Unemars d662d12ca7 Merge origin/main into brush-big-tip-parallel 2026-10-21 19:42:54 +02:00
aiongg 4804148ff9 Merge PR #3759: Pattern Stamp and Background Eraser draw live; Spot Healing shows its heal area (TOOL-213-7, #3754)
# Conflicts:
#	docs/gaps.md
#	docs/target-app-parity.md
2026-10-21 05:04:04 +00:00
durtyrobbin 1ff31fc544 docs: clarify live mixer contracts and qualification fixtures 2026-10-20 23:50:19 -04:00
durtyrobbin 56d3e16940 Integrate current Mixer Load and Clean controls and clear every completed job preview 2026-10-20 21:41:31 -04:00
aiongg 4f4dcb3a01 Merge PR #7748: Brush smoothing: catch-up compares the pose too, not only the position (#7747) 2026-10-21 01:06:17 +00:00
aiongg 6172d967ae Merge PR #5784: Paint: Lock Transparency blends source-atop on semi-transparent pixels (#5783) 2026-10-21 01:06:16 +00:00
Sir Starch 480c12304d Pencil: align click and line boundary snapping (#4895) 2026-10-20 23:00:18 +02:00
durtyrobbin 70018d0388 Integrate live Mixer Brush with current main 2026-10-20 16:18:50 -04:00
aiongg 0ae688b59a Merge PR #6939: Mixer Brush: Clean Brush empties the brush, and the automatic Load and Clean can be switched off 2026-10-20 18:39:27 +00:00
David Mann 38605ceac5 Merge main into feat/tool-213-7-live-retouch
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

# Conflicts:
#	crates/ui-egui/src/canvas.rs
#	docs/gaps.md
#	docs/target-app-parity.md
2026-10-20 19:05:39 +02:00
David MannandClaude Opus 5.5 c4e8eb2b86 Brush smoothing: catch-up compares the pose too, not only the position (#7747)
Since #5726 the smoothed brush pulls its pressure, tilt, rotation and wheel
towards the pointer like its position, but Stroke Catch-Up (`lagging`) and
Catch-Up On Stroke End (`finish`) still compared x/y only. A pen that changed
only its pressure in place got no catch-up time and no end point, so the
stroke ended at an in-between pressure (1.0 -> 0.0 ended at 0.64).

Both checks now also compare the pose (rotation on the circle).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 14:07:15 +02:00
aiongg fc990e5818 Merge PR #5726: Brush smoothing: the lagging brush keeps the pressure of where it is (#5713) 2026-10-18 20:33:43 +00:00