Commit Graph
16 Commits
Author SHA1 Message Date
Tanish Manku aaf11d9dd1 Merge pull request #6735 from vangel76/fix/6513-stroke-knockout
Compose: Normal inside/center stroke replaces the layer beneath it (#6513)
2026-11-10 23:56:46 -07:00
13dcec6a78 Stroke Emboss bevels every enabled stroke, not only the first (#9337)
With several Stroke effects, the reference application embosses their union: a 4 px stroke
listed over a 10 px one shades the whole 10 px band. The PR used only the first stroke, so the
outer part of a wider second stroke stayed flat. A stroke at 0 % opacity still has its band
embossed there, so the bevel stays independent of the stroke's opacity (pinned by the test).
Inside painting and the interior-blend decision now need every stroke to be inside-only.

Co-Authored-By: DuBearte <130190089+DuBearte@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-09 19:18:22 +01:00
DuBearteandClaude Opus 5.5 508c5624d3 Stroke Emboss with its stroke wholly inside counts as an interior blend, as an Inner Bevel does
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 18:03:51 -05:00
DuBearteandClaude Opus 5.5 f190d1ba28 feat(compose): Stroke Emboss bevels the stroked outline (#8639)
Stroke Emboss was drawn as an Inner Bevel of the layer, shading the
layer's own edge. It now bevels the outline of the layer with its top
Stroke effect and shades only the stroke, as Photoshop does; without a
stroke it shows nothing. The GPU plan hands a layer with Stroke Emboss
to the CPU compositor, which builds the stroke's band.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:39:34 -05:00
David MannandClaude Opus 5.5 b9613c6caa Compose: Softer outer glows end before Size again, no tail past it
Reverts #8039 ("Compose: Extend Softer outer glows past Size (#7899)"),
which added a range-scaled fading tail beyond Size to Softer outer glows,
on the CPU compositor and the GPU one alike, and widened the effect
margin by it.

The reference application, measured: Outer Glow, Softer, Size 60,
Range 50 % (and 100 % alike), white, Normal, Opacity 100 %, Spread 0,
Noise 0, on an opaque white shape over black (240 x 40 document, shape
over the left 100 px, full height, sampled at row 20): the glow reads 4
at 50 px from the edge, 1 at 54, and 0 from 56 to 70 px. It reaches zero
just before Size; there is no tail beyond it.

The reverted code (the two-box tent) gives, in that setup, 8-bit levels
4, 1, 0, 0, 0 at 50/54/56/60/70 px for Range 50 % (unrounded 3.56,
1.20, 0.49, 0, 0) and 2, 1, 0, 0, 0 for Range 100 % (1.78, 0.60, 0.25,
0, 0); #8039's tail lifted 56-62 px above zero. So the revert stays as
is, CPU and GPU unchanged from before #8039.

Conflicts were formatting-only (later rustfmt of #8039's lines) in
compose effects.rs, effects/paint.rs and gpu fx/builders.rs; resolved to
the pre-#8039 code. The GlowSource/GlowTechnique imports a later commit
kept in gpu fx/tests.rs for #8039's test go with the test.

New test softer_outer_glow_fades_out_before_its_size renders that
document through the CPU compositor at Range 50 % and 100 % and checks
50 and 54 px within 2 levels and 56, 60 and 70 px at exactly 0.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 16:34:03 +01:00
vangel76 cb42aa61e9 Merge upstream/main into fix/6513-stroke-knockout 2026-10-29 20:43:00 +01:00
FredApps ea024174b2 Remove stale crop reset hook and apply CI formatting corrections 2026-10-29 18:59:43 +01:00
FredApps 255ecc81d0 Remove 21 requested PR contributions from the 108-PR integration
Retain 87 PRs. Reconcile overlapping integration fixes and update testing scope.
Removed: #7153 #7742 #5493 #9282 #3455 #9172 #3139 #3967 #4783 #5453 #8347 #1991 #3345 #4042 #4305 #4883 #4890 #5090 #6621 #5870 #5939.

Combined CI pending for this source; historical portable artifact is not applicable.
2026-10-29 18:49:17 +01:00
FredApps 78f9c137b3 Merge approved PhotoCraft PR #6621: Crop: right-click on the pending crop opens the crop menu (#6561)
Port behavior and regression coverage into current modules; preserve current upstream behavior.
Extended current crop menu with Reset and shield toggles, preserving newer preset management, overlays, ownership checks and no-menu-during-gesture logic. Ported reset-frame no-op/undo semantics into current CropState/release and crop commit; retained original regression cases in split modules.
2026-10-29 05:29:44 +01:00
FredApps f369874ddb Merge approved PhotoCraft PR #8039: Compose: Extend Softer outer glows past Size (#7899)
Port behavior and regression coverage into current modules; preserve current upstream behavior.
Added bounded Softer outer-glow tail in current CPU paint and GPU glow-builder modules, retaining original tent convolution and current program dispatch; registered exact tail/kernel regression and expanded render margin only for outer Softer glows.
2026-10-29 05:24:44 +01:00
FredApps cfc24243aa Merge approved PhotoCraft PR #8903: Box-filter minified patterns in the CPU and GPU samplers (#8831)
Port unchanged PR hunks to their unique current module locations after upstream file splits.
2026-10-29 03:36:41 +01:00
Dylan M. Taylor f0ffcef216 Refactor compose for strict Clippy checks 2026-10-27 23:47:06 +00:00
vangel76andClaude Sonnet 5.5 5cccd2fcf7 Merge upstream/main into fix/6513-stroke-knockout
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-27 20:05:32 +01:00
aiongg 32588fb0ac refactor(compose): split effects.rs into effects/ 2026-10-26 22:54:55 +00:00
aiongg 9bb2423533 refactor(compose): split lib.rs into composite, content, ctx, extents, fx_cache, reduced, render 2026-10-26 22:54:55 +00:00
aiongg 805d8b77b8 refactor(compose): move effects.rs tests to effects/tests.rs 2026-10-26 22:30:13 +00:00