- Channel targeting routes an allow-list of pixel-editing paint commands, not every
`paint.*` id: the Mixer Brush's Alt-click load and Symmetry no longer follow a colour
set or get refused with "Rasterize the layer" on a fill layer. Patch and Content-Aware
Move stay routed (#9274).
- Native vector save-back checks the preview SVG as strictly as stored previews are
checked on load and PSD export, so a preview with an unreadable embedded image is
refused instead of stored and later dropped (#8571).
- .pcraft blobs read their zstd frame with framing headroom, so an incompressible
preview right at its 16 MiB limit still loads; the limit still bounds the data.
- Levels/Curves recall (Alt+shortcut) decides the combined Lab record from the target
the dialog captured, as remembering does, so a viewed layer mask keeps its settings
beside a Lab colour set (#9274).
Each comes with a test that fails without it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Since main's #3464 a Pen draft carries the owner its first click captured
(document, revision, target path). The test built a draft with no owner,
so finishing it took the target from the current UI state, where path.set
had left the old work path selected, and appended to it: the selection
became 0,0 170x80 instead of the triangle plus the square. The test now
captures the owner as main's Ctrl+Enter test does, with the work path not
selected in the Paths panel (the Pen then starts a new work path).
Co-authored-by: mahefanante <42338306+mahefanante@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The FIFO export test new on main builds a SmartObject without #8571's
vector_preview field, and #8311's typeBoxOverflow key takes the inspect
snapshot's json! past the default macro recursion limit of 128.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reverts #5165 (merge d9b7c5f7cd). #5165 made a click on a section's name
in Brush Settings (Shape Dynamics, Scattering, …) show its controls
without ticking its box. In the reference application, checked by hand,
clicking the name shows the section's controls and ticks it; clicking the
name of a ticked section leaves it ticked. Only the checkbox turns a
section off. That is what PhotoCraft did before #5165.
brush_panel tests pass (50).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The reference application's Liquify has Twirl Clockwise only; holding
Alt (Option on macOS) while using it twirls counterclockwise. PhotoCraft
had an extra Twirl Counterclockwise tool on the strip, and #9598 had just
given it a mirrored icon.
Twirl Counterclockwise leaves the tool strip (LiquifyTool::ALL, 11 to
10 tools) and the rotate-ccw icon #9598 added goes with it (asset,
icon_data entry, ATTRIBUTION count back to 113). Alt already reversed
Twirl Clockwise at stroke-down; that stays. The TwirlCcw variant stays as
a stroke's direction: Alt-strokes record `twirlCcw`, and filter.liquify
strokes and older saved strokes naming it still replay as Twirl
Clockwise reversed (the command doc says so). Selecting it as the tool
(control channel `tool: "twirlCcw"`, or a preference saved by an older
version) is refused with an error that says to choose twirlCw and hold
Alt; the rest of the settings still apply and the dialog opens.
Tests: the_tool_strip_has_no_twirl_counterclockwise (no such tool, label
or missing icon on the strip, C is Twirl Clockwise, `twirlCcw` as the
tool is an Err and leaves the tool, an old saved preference naming it
opens); alt_with_twirl_clockwise_twirls_counterclockwise (the field
displacement a dab leaves right of the centre points up without Alt and
down, mirrored, with Alt). twirl_counterclockwise_has_its_own_mirrored_icon
and the twirlCcw row of alt_reverses_twirl_and_swaps_pucker_and_bloat
are removed. The i18n labels for Twirl Counterclockwise stay (the
variant's label).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reverts #9703 ("Fix adjustment layer name clicks targeting masks"), which
made a click on an adjustment layer's name target the layer's contents
instead of its mask.
The reference application, measured through scripting (targetChannels):
selecting an adjustment layer from another layer targets its mask, as
before #9703; a masked pixel layer targets its contents; clicking the
content thumbnail still targets the contents. So the behaviour before
#9703 was right.
The revert applied cleanly. Its test asserting the opposite goes with it;
a_new_adjustment_or_fill_layer_shows_its_settings_until_the_mask_thumbnail_is_clicked
again expects a row click on a new adjustment layer to target the mask.
New test selecting_an_adjustment_layer_from_another_layer_targets_its_mask:
for Hue/Saturation and Curves layers, a name click coming from another
layer targets the mask (and painting goes to the mask), the content
thumbnail targets the contents, and a masked pixel layer's name click
targets its contents.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#4985 added a canvas Shift+right-click popup that worked only for the
Brush and listed only its painting modes. In the reference application
Shift+right-click opens a menu for every painting tool: Edit Brush…
(the Brush Preset picker a plain right-click opens), a separator, then
the tool's own Mode list from its options bar:
- Brush, Pencil: the painting modes with Behind and Clear
- Clone Stamp, Pattern Stamp, History Brush: the blend modes
- Mixer Brush, Color Replacement, Background Eraser: Edit Brush… only
- Eraser: Brush / Pencil / Block (no Edit Brush…)
- Blur, Sharpen, Smudge: Edit Brush… (the reference lists modes too)
- Dodge, Burn: Shadows / Midtones / Highlights; Sponge: Desaturate /
Saturate
- Healing Brush: its blend modes; Gradient: the blend modes; Paint
Bucket: the blend modes with Clear (no Edit Brush…)
- Spot Healing, Magic Eraser and non-painting tools: no menu, the
gesture keeps its old route
brush_mode_menu.rs is now a per-tool item list (Item enum + items(tool))
instead of a Brush-only list. Each row sets exactly what the tool's
options-bar control sets: a brush-based tool's mode through
tools.setBrush (Brush/Pencil also Behind and their own Clear flag), the
Eraser mode, tone range, sponge mode, gradient and bucket modes as tool
options. Blend modes are grouped with separators; the current choice is
checked; Behind and Clear are greyed on the Background layer. The menu
remembers the tool that opened it and closes on a tool change.
Only settings the options bar already has are offered. Not offered yet
(no setting here): Behind for the stamps, History Brush, Gradient and
Paint Bucket; the Blur/Sharpen/Smudge modes; the Spot Healing modes;
the Healing Brush's Sampled/Pattern source and Replace; the History
Brush source.
Control: ui.inspect's brushModeMenu reports tool, mode, choices (the
active tool's labels) and items (label/enabled/checked, separators);
ui.context.choose {id: <label>} picks a row, an unknown or greyed row
is an error that changes nothing.
Tests (kittest): each representative tool's rows in order, choosing a
row sets the options-bar state and journal, Edit Brush… opens the
picker at the click, Behind/Clear greyed on the Background, Magic
Eraser and Spot Healing open nothing; control graceful failure for bad
choices. "Edit Brush…" added to every catalog.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The swatches that now open the full Color Picker changed only on OK, so Photo Filter, B&W Tint,
Gradient Map stops (Properties and Image > Adjustments), the Content-Aware Fill and Select and Mask
overlays, Neon Glow and Save for Web lost the live preview main's popup had. The open picker now
previews its colour on the swatch every frame, Cancel (or OK unchanged) restores the exact opening
value (bit-exact for linear floats), and the Properties panel commits one history step when the
picker closes. A picker closed without OK or a preview changes nothing (a Gradient Map stop at a
PSD's 1229/4096 kept its location on Cancel).
With no document open, the options-bar popover's Color Picker refused OK ("no document open")
before reaching the tool-only path; it now sets the next shape's colour as on main.
A popover swatch the shape refused (a job holding the document) still joined Recently Used Colors;
it now joins only after the edit succeeds. Adds a CAF keys test for an open widget picker, and
fixes the ui-parity date and count the main merge set back.
Co-authored-by: SimoneRecchia <201361065+SimoneRecchia@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#6236 made Escape put back the colour the gesture started from. In the
reference application Escape while the right button is held closes the
HUD and keeps the colour picked so far; moving the pointer afterwards
changes nothing (measured: picked 0,40,96 from 40,90,160; after Esc and
a further move it stayed 0,40,96, also after the release).
Escape now ends the gesture like the button release does. The pick is
still one coalesced history step, so Undo takes it back.
Test: Escape closes the HUD with the picked colour kept, a later move
picks nothing, and releasing the button afterwards opens nothing.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#6236 drew the hue strip left of the saturation/value square and opened
the HUD just below the press point. In the reference application the
square is on the left with the hue strip to its right, and the HUD opens
so the colour you start from sits under the pointer: pressing without
moving changes nothing, and a small move nudges the colour from there.
The HUD now uses that layout and placement (still pulled in to stay on
screen near an edge). The rects come from one `layout` function, shared
by drawing, hit-testing and the tests.
Tests: the square is left of the strip and the starting colour's spot is
under the pointer; a mid colour opens with the pointer inside the square
and picks nothing until it moves; near the bottom-right corner the HUD
stays on screen and the press alone picks nothing.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The live text / gradient stop colour preview came before the Free
Transform branch of canvas display_doc, so Ctrl+T on a type layer plus
the swatch's Color Picker drew the layer twice (old place in the copy,
transformed texture on top). It now steps aside while a transform is
open.
After OK the canvas caches still held the preview key, so the 24-36 MP
canvas refreshed in full. OK now counts the shown preview as the
document when it was built from the same params (as type_transform
does), so only the commit's damage is redrawn.
A refused preview (e.g. a missing layer) ran Session::new + document
clone + the command on every frame; the refusal is now remembered for
its key. Params naming no layer (an agent's ui.dialog.set) are not
previewed: the command would fall back to the preview session's
selection, not the user's.
The tests now go through canvas::display_doc, damage_since and
ensure_texture, so removing either canvas hook fails them.
Co-authored-by: saschaweiss <17774249+saschaweiss@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts resolved as unions of both sides: codecs re-exports (PngRows + TiffBands), smart_cmds source imports
(main's source_surface_from_buffer and cache API with #8571's svg_source_image_in/convert_svg_source; main's
duplicate rendering import dropped), io flat.rs test modules (#8536's banded TIFF tests and main's PNG ones),
menus/invoke.rs (#8571's smart SVG intercept and main's layer.selectUnderCursor), state.rs (#8311's
type_box_overflow and main's type_insertion_style), the canvas_geom test keeps the is_finite guard, docs
status lines keep both change lists, i18n catalogs keep both sides' rows (hi.tsv: main's wording where both
added the same string).
Liquify, Adaptive Wide Angle and the Filter Gallery refused to open with a
layer mask, a smart object's filter mask, an alpha channel or the Quick Mask
targeted ("This filter workspace requires layer pixels or native colour
channels"). Without a colour set they now open on the layer or smart object
again and send no `target`, so the command routes the targeted surface as
before. With colour rows on a smart object they refuse at open, as the
command refuses at OK.
Colour rows stay selected across layer switches, so with Red still targeted
the Brush on a Levels adjustment layer was refused ("Rasterize the layer
before editing colour channels") instead of painting its mask, and type,
shape, smart object and fill layers skipped the rasterize prompt. A colour
set now targets raster layers only; several rows still stop Move and
transforms on any layer, at press as before.
Clicking a pixel layer's mask thumbnail (or adding a mask to it) with colour
rows selected left the rows targeted, so the Brush painted Red instead of the
mask. Targeting the mask now moves the Channels target onto it (a view
change, no recorded step); clicking a row again takes the rows back.
Edit > Stroke and the Magic and Background Erasers are now routed but still
edit the layer with an alpha channel targeted, so Edit > Fade faded the
untouched channel. Fade now picks the channel or Quick Mask only when the
command changed it.
Main's #9483 mixes selections as o*(1-k) + a*k; the fused colour-set tone
path still used o + (a-o)*k, so fused_tiles_match_scalar_oracle_* failed
after merging main (16-bit Levels with a selection). It now mixes the same way.
Co-authored-by: Vlad Grankovsky <4578120+hidoba@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
748 upstream commits: append-only conflicts (i18n, ui-parity, people.toml,
the tools module lists) keep both sides. Scorecard: 12 of 183 settings do
nothing; docs/ui-parity.md follows it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
UPDATE_APP (native builds; craft-update is a native-only dependency) carries our 128 px icon and accent (#2f7bf5, its colour in ArtCraft Launcher). The updater, the self-update
helper and craft-update's startup prompt all get them through crate::UPDATE_APP; the
prompt draws the icon, the accent and "by ArtCraft" (craft-update's default developer).
craft-update is pinned to storytold/craft-libs main at 1065653e7 (#434).
Clippy fixes for Rust 1.99 in untouched code (same logic):
- apps/photocraft/src/app_dirs.rs
- crates/codecs/src/codecs/via_image.rs
- crates/engine/src/canvas_geom/tests.rs
- crates/ui-egui/src/panels/blend_preview.rs
217 upstream commits. Upstream added a colour swatch (Select and Mask's
overlay colour): it now opens the Color Picker titled "Color Picker
(Overlay Color)". Content-Aware Fill and Select and Mask leave their keys
to an open Color Picker, as they did for the swatch popup it replaced
(test keys_wait_while_the_overlay_colour_picker_is_open).
docs/ui-parity.md keeps the scorecard's 12 of 182.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
#10021 combined this PR's catalog at an earlier head (1047bb355). The author's
later push (94cb2cc9c) translated the strings main gained since and listed nb
in CFBundleLocalizations, which #10021 also did. This merge keeps main's code,
tests and docs and takes the author's wording on 49 of the 76 rows where the
two differ, among them "Vis/Skjul snitt" for the font Styles toggle (main had
"stiler") and "Fyll pensel" for the mixer brush's Load Brush. Main's wording
stays where it carries the catalog's one-term choices or the code's meaning:
"tegneflate" for Artboard (tegnebrett is a drawing tablet), "forvalg" for
presets, "Klatt" for Dab, "Fargetone" for Hue, "Halvtone", "web-",
"Opprett utvalg", "Trinn", "Helling", the menu name "Fluktpunkt", the label
"Ta prøve fra alle lag", the theme names, "Antall" for the histogram's pixel
count, «copy» (the suffix Save a Copy really appends), the spelling "seriff",
and the imperative "Oppdater uten buffer" for the button.
Co-Authored-By: Nikolai Nyegaard <6809008+nikolainyegaard@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#10021 combined this PR's catalog at an earlier head (5ecaf1d48). The author's
later push (1990c7c18) translated the strings main gained since; #10021 had
translated the same strings itself. This merge keeps main's code, tests and
docs and takes the author's wording on 31 of the 42 rows where the two differ,
plus a 32nd with one fix. Main's wording stays where it is deliberate: the
space before % (Finnish typography), "Sävytaso" and "perspektiivitaso" (taso is
Layer), "Kirjainväli" for Tracking (Merkkiväli is Letter Spacing), the menu
name "Pakopiste", the product name Generator, and the imperative "Päivitä ilman
välimuistia" for the button. The CPU-drawing notice takes the author's row with
"järjestelmän tiedot", as the System Info menu reads.
Co-Authored-By: Janiz-zzz <267742026+Janiz-zzz@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The #7153 fix-up pushed filter_rows to cognitive complexity 32/30; the
selection that runs ahead of the filter editor is now its own function.
No behaviour change.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>