Commit Graph
11425 Commits
Author SHA1 Message Date
yoriswind 35db7b1e67 Merge current Channels panel changes into the Actions repair 2026-11-05 17:30:21 -08:00
David Mann 66c328dc2b Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/scorecard.md
2026-11-06 02:29:28 +01:00
David Mann 8d56d89a35 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 02:29:13 +01:00
dotCooCoo 70f8299c8b Merge main into feat/hand-scroll-all-windows 2026-11-05 17:24:18 -08:00
Zinadin ZidanandClaude Opus 5.5 3d60ad01f9 Channels: the panel menu has the channel commands, New Spot Channel among them (#11451) (#11557)
* Channels: the panel menu has the channel commands, New Spot Channel among them (#11451)

The Channels panel's menu had no channel items, so New Spot Channel... and
the rest could only be reached from a row's right-click menu. It now lists
New Channel..., Duplicate Channel, Delete Channel, New Spot Channel...,
Merge Spot Channel, Channel Options..., Split Channels and Merge
Channels..., each acting on the targeted channel and greyed where it can't:
Duplicate takes a single colour, alpha or spot channel, the composite of a
one-channel image, the Quick Mask or a targeted layer mask. Channel
Options... in Quick Mask mode now opens the targeted alpha or spot
channel's options, not Quick Mask Options. The panel menus run their
commands through the menu bar's enabled rules, so the Layers panel menu
greys its dialog items the same way too. The labels are in every catalog.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: New Channel... and Merge Channels... ask first, from the panel and row menus (#11451)

The panel menu's Merge Channels... ran channel.merge with no parameters, and
the engine merged the first grayscale documents into RGB and closed them with
no choice; New Channel... added a channel straight away. Both now open a
dialog when called without parameters, as New Spot Channel... and Channel
Options... already did: New Channel... reuses the Channel Options dialog
(name, colour indicates, colour and opacity), and a new Merge Channels
dialog picks the mode and the open grayscale document for each channel. The
channel rows' menu had the same two items and goes through the same path.
With parameters (scripts, the New button) both still run at once.

The Merge Spot Channel test now checks pixels, so a delete couldn't pass it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: Merge Channels waits for three grayscale documents and the dialog offers only modes they fill (#11451)

With two grayscale documents open, Merge Channels... was enabled and its
dialog repeated a document for the third channel; OK then failed in the
engine and the dialog closed. The engine's rule now needs three documents
of one size (no mode merges fewer), so the menus grey the item below that.
The dialog offers only the modes the open documents can fill (RGB and Lab
from three, CMYK from four), greys OK with the reason while the picks
repeat, keeps itself open when OK is refused, and comes back with the
engine's message if the merge itself fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Channels: the Merge Channels dialog keeps its picks by document id (#11451)

The dialog kept the picked source documents by tab index, and background
work can still run while it is open, so a document moved or closed in the
meantime could leave another one at a picked index; OK would then merge,
and close, the wrong document. The picks are now document ids, resolved to
the current tabs when OK is pressed: a closed pick, or one that is no
longer a grayscale document of the same size, is refused with the reason
and the dialog stays open.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:20:08 +01:00
David Mann cc361c306d Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/engine/Cargo.toml
#	crates/engine/src/prefs.rs
#	docs/ui-parity.md
2026-11-06 02:16:44 +01:00
David Mann 3af79c0cb7 Merge main 9b02eac2c4 into integration batch 18 2026-11-06 02:14:46 +01:00
Hector VillarrealandClaude Opus 5.5 e4f2069b1b Paths: ⇧⌥⌘↩ intersects the path with the selection (#7726)
Main already has Add Path to Selection (⇧⌘↩) and Subtract Path from
Selection (⌥⌘↩) as engine commands (#8015). This adds the third,
path.intersectWithSelection (Cmd+Alt+Shift+Enter), next to them:
path.toSelection with mode "intersect", loading the path selected in
the Paths panel (or the one being drawn) from the UI as the other two do.

Tests: an engine test that the three fixed-mode commands match
path.toSelection with their mode whatever mode the params ask for, and
a UI test pressing ⇧⌘↩, ⌥⌘↩, ⇧⌥⌘↩ and ⌘↩ through the egui input, with
Photoshop 2025's areas for the same document (7200, 5200, 800, 2000 px).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 19:13:59 -06:00
yoriswind 84c41c5f10 Limit Actions panel changes to the five reviewed commands 2026-11-05 17:13:15 -08:00
David Mann f98124cebc Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/ui-egui/src/tools/crop_presets.rs
2026-11-06 02:13:07 +01:00
Zinadin ZidanandClaude Opus 5.5 9b02eac2c4 Export to files: a Custom JPEG quality in Artboards, Layers and Layer Comps to Files (#11481) (#11558)
* Export to files: a Custom JPEG quality in Artboards, Layers and Layer Comps to Files (#11481)

The engine commands already took `quality` (0..12), but their dialogs
offered no way to set it. Each dialog now has a Quality row with a Custom
checkbox, shared with Batch: quality is sent only for JPEG with Custom on,
so an export left alone writes exactly what it wrote before (the source
JPEG's own quality, else the encoder default), and PNG, WebP (still
lossless), PSD, TIFF and BMP never get one. Alt+Reset restores the Custom
state too. The fields follow the reference dialog's order.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Tests: the export quality tests go through the dialog's own controls (#11481)

Custom and Quality are now ticked and typed through their widgets, a new
test switches one dialog from JPEG to PNG and WebP and back and checks the
Custom quality survives, and Alt+Reset is clicked through the same path the
app uses instead of calling reset_form.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:10:18 +01:00
David Mann 0fb63e2f58 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-11-06 02:07:26 +01:00
David MannandClaude Opus 5.5 88704d2350 Merge fix-up: the turned crop's hidden pixels after Layer 0 replaces the Background
Since #10867 the non-deleting crop turns a 2000 px layer to 2001 px bounds, so
the budget refusal names 200100 x 200100 px.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:06:41 +01:00
David Mann 4b61c8ef34 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/algo/src/resample/tests.rs
2026-11-06 01:58:38 +01:00
David Mann dabf3bab97 Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	docs/scorecard.md
2026-11-06 01:54:36 +01:00
Higgs32584andClaude Opus 5.5 178bf45062 fix(transform): keep main's Distort comment; only the frontmost hit commits the box
Restore main's comment that Distort moves corners and edges (#10085), which the
merge with main had reverted. on_other_layer now checks the frontmost hit under
the click (skipping the moved and fully locked layers, as Auto-Select does), so a
grouped layer covering a top-level layer keeps the box open instead of
committing through the covered layer.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 19:52:44 -05:00
David MannandClaude Opus 5.5 5b1b6cf13d Merge fix-up: check entity markup in main's bounded embedded-SVG parse too
nesting_depth now returns a Result; main's parse_image_bounded_with gets the
same entity-markup rejection as the other callers.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:49:40 +01:00
David MannandClaude Opus 5.5 a79db76e30 Address review: Alt-letter test also starts a crop in progress
Over the untouched default frame crop_shield::keys returns early, so
the Alt+H/Alt+P cases checked nothing; only Alt+I reached its key check.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:48:29 +01:00
David Mann d563b3100b Merge commit '9bef3b2dc8b84c1b6cefc8ce0dc2b01d089cd9e8' into HEAD
# Conflicts:
#	crates/engine/tests/it/svg_smart_object.rs
2026-11-06 01:46:48 +01:00
David Mann 1d36dc5f0d Merge main into fix/5532-blend-separators 2026-11-06 01:40:39 +01:00
David MannandClaude Opus 5.5 82f5a11067 Address review: separators on main's ComboBox, without #5501
Merge main (0f15223e18) and rebuild #5532 on main's craft_ui::ComboBox:
#5501's hand-written combo_list and its call-site migrations (gradient
map, crop ratio, kerning, press_menu, the wheel and height tests) are
dropped in favour of main's versions; the list height stays #7622's.

The group lines are drawn inside ComboBox::show_ui: a 1 pt line that
takes no width during egui's sizing pass, above Darken, Lighten,
Overlay, Difference and Hue, never above the first row. Used by the
Layers panel's Blend Mode box (also the greyed one with no layer), the
Brush/Pencil Mode list (Clear starts no group), the retouch and Paint
Bucket Mode lists when they hold every blend mode (the Healing Brush's
short list draws none) and the Gradient's Mode list. The Brush Mode
right-click menu shares the same rule (starts_blend_group).

Tests: the Layers kittest at 1440x900 finds exactly the five group
boundaries; a widget test checks the first row gets no line and the list
keeps its width; a 1440x900 click released in place on the Blend Mode box
opens the list beside the box and changes nothing.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:40:15 +01:00
David MannandClaude Opus 5.5 0e1cdc45cb Address review: #[must_use] on fit_canvas; Duplicate follows the shift too
fit_canvas's (i32, i32) shift is now #[must_use], so a caller can't drop it
and leave the Color Sampler points and painting symmetry behind. That
flagged the last caller that still dropped it: Layer > Duplicate on a board
(place_copy, single and several layers). place_copy now returns the shift and
both duplicate paths pass it to follow_shift. It is non-zero when another
board was already past the origin, as an imported PSD can hold.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:39:48 +01:00
David Mann b1bd2da9d7 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/layer_copy_cmds.rs
2026-11-06 01:33:39 +01:00
David MannandClaude Opus 5.5 e5e2ef36d0 Address review: crop key tests reach keys() past the default-frame guard
After #9855 crop_shield::keys returns early over the untouched default
frame, so the Shift+H/Shift+P and Alt-letter tests on crop_app() passed
without the fix. They now start a crop in progress (frame changed,
default_frame false); the Shift tests also cover the untouched default
frame (and, for Shift+I, no frame), where the letters must still reach
the tool keys. Plain P with a crop in progress still toggles Classic
Mode, so the setup really reaches the key checks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:33:34 +01:00
David MannandClaude Opus 5.5 54507626d1 Merge main into fix/crop-shift-letter-keys
Keeps main's default_frame guard in crop_shield::keys (#9855) and the
per-event unshifted check from this branch.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:33:15 +01:00
David Mann 9bef3b2dc8 Merge pull request #6088 from davidmann4/fix/snapshot-followups
History snapshots: follow-ups to #3567 (#6087)
2026-11-06 01:32:54 +01:00
David Mann 3d5ee644dc Merge origin/main
# Conflicts:
#	crates/engine/src/cmd/artboard_cmds.rs
#	crates/engine/src/cmd/layer_multi_cmds/moves.rs
2026-11-06 01:30:27 +01:00
David MannandClaude Opus 5.5 608cedc5eb Address review: keep scaled pattern scales within 1..1000 %
scale_effects (Image Size's Scale Styles, Layer Style > Scale Effects, the
Free Transform style preview) now clamps the Pattern Overlay, Bevel & Emboss
Texture and pattern Stroke scales to the 1..1000 % the Layer Style dialog
allows, through one shared photocraft_doc::effects::PATTERN_SCALE_RANGE that
the layer style param parser now uses too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:24:20 +01:00
David MannandClaude Opus 5.5 2037705698 Address review: pin crop's 0 origin, numeric strings, partly-outside rect and Reveal All
x/y of 0 count as given, numeric strings are refused on every side, a
rectangle partly past the canvas grows it as passed, and Reveal All
(crop_keeping_background) still crops to all four sides with a selection
active.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:21:45 +01:00
David Mann 35bffe6e4e Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/image_cmds.rs
2026-11-06 01:21:45 +01:00
David Mann 0f15223e18 Merge pull request #7739 from davidmann4/fix/crop-swap-button-turns-frame
Crop: the options-bar swap button turns the frame instead of shrinking it (#7738)
2026-11-06 01:07:36 +01:00
David Mann 945fec8665 Merge remote-tracking branch 'origin/main' into HEAD 2026-11-06 01:07:30 +01:00
David Mann bac5c2802b Merge pull request #9405 from davidmann4/fix/svg-guard
SVG: a drawing the renderer panics on is an error, not a crash (#9404)
2026-11-06 01:06:04 +01:00
David Mann a46eb590a9 Merge pull request #9410 from davidmann4/fix/svg-filter-cost-9409
SVG: refuse filters too costly to render (#9409)
2026-11-06 01:05:30 +01:00
ArjenS-LA a6dc7bb86a Use the grayscale format in Average coverage regression 2026-11-05 15:59:05 -08:00
David MannandClaude Opus 5.5 bb28a5210c Batch 18: regenerate parity-checklist and scorecard (660 menu items, #11497)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:53:47 +01:00
David MannandClaude Opus 5.5 6e42bc901e Batch 18 (#11458): a guarded label lookup in the Content-Aware crop donor check
The donor check indexed the label buffer directly; the bounds are inside
the canvas today, but a lookup that is out of range now counts as no donor
instead of panicking.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:53:47 +01:00
ArjenS-LA a38fc6ff5b Refresh Average Smart Filter stack and verify selection and channel values 2026-11-05 15:53:24 -08:00
yoriswind a34a936e80 Integrate current main for the Free Transform hit-zone tests 2026-11-05 15:52:45 -08:00
ArjenS-LA 19b5ef0fb3 Merge current main and strengthen Average selection regression 2026-11-05 15:52:30 -08:00
midasdf eafaf5cc5d Merge remote-tracking branch 'origin/main' into jp/print-paper-sizes
# Conflicts:
#	docs/target-app-parity.md
2026-11-06 08:51:40 +09:00
David MannandClaude Opus 5.5 2a6bee9ba3 Batch 18: keep #[cfg(test)] on every merged test module in ui-egui/src/lib.rs
The lib.rs conflicts between #11494, #11497, #11443, #11500, #11502 and
#11295 were resolved by keeping both mod lines; the shared #[cfg(test)]
line was kept only once.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:33:41 +01:00
e59dcc9c44 GPU plan: cache adjustment LUT rows between plans (#11498) (#11539)
* GPU plan: cache adjustment LUT rows between plans (#11498)

adjustment_program rebuilt the Levels/Curves tone tables on every plan
(twice per refresh), about 1-2 ms per Levels layer each time. Keep the
rows of Levels, Curves, Color Balance and Hue/Saturation ranges in a
32-entry most-recently-used cache (photocraft_compose::lut_rows, at
most 32 x 3 x 16 KiB = 1.5 MiB), built outside the lock.

Entries are keyed by a u64 hash of exactly what each row builder reads,
fields destructured in full and floats by bits (-0.0 and 0.0 stay
apart). Hue/Saturation master sliders don't add entries; Hue/Sat ranges
and Color Balance don't depend on depth. Edit > Purge > All drops the
cache, and a filled cache enables it.

Release, per call: Levels 8/16-bit 1.10 -> 0.003-0.018 ms, Curves
0.16 -> 0.018, Color Balance 0.11 -> 0.001-0.015, Hue/Sat ranges
0.05 -> 0.008-0.018. The tables are identical, so rendering is unchanged.

Tests: cached rows match fresh tables bit for bit at 8/16/32-bit, hits
and LRU eviction on a local cache, key coverage, and Purge All
releasing the cache.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* compose: rustfmt the LUT row cache tests (#11498)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* GPU plan: test that plans read cached LUT rows and that curve points key them (#11498)

Plant rows no builder makes under a fresh key and check the planner returns
them, and check that moving a Curves point changes its key (review on #11539).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* compose: prevent in-flight LUT builds from undoing purge

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: FredApps <FredApps@users.noreply.github.com>
2026-11-06 00:32:49 +01:00
David Mann 09e44e022c Merge PR #11497: Menus: View › Guides submenu in the reference's order, with Edit Selected Guides and Clear Selected Guides (#11400)
# Conflicts:
#	crates/ui-egui/src/lib.rs
#	docs/parity-checklist.md
#	docs/scorecard.md
2026-11-06 00:29:28 +01:00
David Mann 166dc4d2b6 Merge PR #11295: feat(ui): bounding box with eight handles for several selected shape layers (#11107)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:17 +01:00
David Mann b81a769b42 Merge PR #11502: The document tab's right-click menu lists the reference's eight entries in order, with its two separators (#11403)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:14 +01:00
David Mann efe061dd08 Merge PR #11500: Layers panel: a right-click on the empty area opens the reference's menu (#11404)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:10 +01:00
David Mann d43d1c6d0a Merge PR #11443: Move tool: History names its steps Move, Nudge and Duplicate as the reference does (#11383)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:07 +01:00
David Mann e932db7c69 Merge PR #11494: Menus: Edit › Preferences says Plugins… and Camera Raw… and has the reference's separators (#11398)
# Conflicts:
#	crates/ui-egui/src/lib.rs
2026-11-06 00:29:01 +01:00
David Mann 1d053f5c2c Merge PR #11495: Actions: play recorded Stack Modes and Video Frame events 2026-11-06 00:28:47 +01:00