Retain the prepared PR fixes, independent regression tests and both progress histories while adopting upstream test organization and date/time updates. No new feature.
Co-authored-by: GPT-6 <noreply@openai.com>
Retain the prepared PR fixes, independent regression tests and both progress histories while adopting upstream test organization and date/time updates. No new feature.
Co-authored-by: GPT-6 <noreply@openai.com>
- P62 is taken on main (File > New, #4017), and P63-P67 by aiongg/next
and #8529: with main merged, `cargo xtask scorecard --check` failed
with "duplicate scenario id P62". The scenario is now P68, listed
after the others.
- Peak RSS came from /proc on Linux and a powershell.exe call on
Windows, and was always empty on macOS, where the nightly perf runs.
The bench now uses photocraft_testkit::perf (RssSampler, row, report),
like the other --json benches.
- `--json --reps 5` took `--reps` as the output path (CodeRabbit); a
following option is now rejected.
- The printed median was the upper middle sample for an even --reps
(CodeRabbit); it now prints the same nearest-rank p50 xtask reports.
- The old `[n] [mp]` usage accepted 36 MP again (AGENTS.md benchmarks
at 24-36 MP); the PR had capped it at 24.
Tests: the new cases `--json --reps 5` (rejects_bad_benchmark_args)
and `4 36` (parses_old_positional_args_and_perf_runner_args) fail with
the fix reverted; `2 37` pins the new upper bound.
Co-authored-by: ersoynarin-code <340219279+ersoynarin-code@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The PR sent ⇧⌥ letters and ⇧+/⇧− to the selected layers whenever the
tool has no Mode menu, Dodge, Burn and Sponge included. In Photoshop
those keys pick the Dodge/Burn Range (⇧⌥S/M/H) and the Sponge's mode
(⇧⌥D/S) and never touch the layer: with Dodge active, ⇧⌥M leaves the
layer Normal (the Eraser and the Mixer Brush do set it). So Dodge +
⇧⌥S turned the layer Screen. They ignore the keys, as #5478 had them,
until their own Range/mode keys exist.
The Healing Brush's brush can hold a mode its short menu lacks: the
Brush's Overlay remembered from before it had a Mode menu (restored at
launch with the tool active, so no tool switch resets it), a brush
preset with tool settings, or tools.setBrush. It then healed in
Overlay, while its dropdown showed nothing and the first ⇧+ seemed
dead. blend_keys::brush_tool_mode now treats such a mode as Normal for
the stroke (clone_params), the dropdown and the keys.
Also moves paint_mode_dropdown's doc comment back onto it, and the
ui-parity row names the Paint Bucket's Clear.
Tests: dodge_burn_and_sponge_leave_the_layer_alone and
healing_brush_heals_in_normal_with_a_mode_outside_its_menu and
healing_brush_with_a_mode_outside_its_menu_steps_from_normal fail
without this change.
Co-authored-by: paulou-jpg <79102098+paulou-jpg@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The warps show a snapshot of the document taken when they start, and draw
the warped layer at its starting opacity in Normal. Forwarding ⇧⌥ letters,
⇧+/⇧− and 1-0 to the layer during a warp changed its mode and opacity
without any visible change on the canvas, added History steps behind the
warp, and Esc did not take them back. They stay with the warp, as on main;
Free Transform keeps them.
The selected layers now change with one layer.setProps call with "layers",
as the Layers panel does, instead of one call per layer joined by a static
coalesce counter. The ui-parity row lists the painting tools that ignore
the keys, Dodge, Burn and Sponge included.
Co-authored-by: paulou-jpg <79102098+paulou-jpg@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- algo/paint.rs: main locks transparency with composite_atop; keep that
for every blend mode, and Clear on a locked layer leaves the pixel.
- paint_mouse.rs: main's Some arm (loads stored tips), the PR's None arm
(a first-seen tool starts in Normal).
- retouch_ui.rs: main moved the Pattern Stamp params into
pattern_stamp_params, shared with its live preview; the PR's `mode`
goes there, so preview and commit agree.
- tool_reset.rs: main's Type keys plus the PR's Paint Bucket mode keys.
- distort_ui.rs (from #5478): main's Delete/Backspace pin branch, then
tool_keys.
- docs: both sides' history rows and status lines.
Co-authored-by: paulou-jpg <79102098+paulou-jpg@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
`file.print` accepts the customary names (はがき, L判, …) and remembers
the `paper` value as typed. On reopening, the Paper control passed that
alias straight to a menu keyed by the canonical `PAPERS` names, so a
valid remembered paper showed `—` instead of its preset.
Resolve the remembered name through `paper_size` and select the
matching `PAPERS` key. Custom arrays still open as Custom, and unknown
names stay as they are.
Tests: a remembered はがき reopens with はがき (100 × 148 mm) selected
and still lays the page out at 283.46 × 419.53 pt.
Docs: say that named papers use the table while custom [width, height]
values are accepted directly.
Main merged #5940, #6472, #7838 and #7922 directly. Kept from the batch:
the snapshot/History-follow identity at the history limit (#5940,
c7ef3676a; main still had the 3-tuple HistorySpot) and the strokeless
shape at a 0 px width step (#6472, 962539607; main still added the
stroke). Main already carries the other two fix-ups (34c9d0ea4, dff8bfd0e).
Overlaps with main resolved:
- #5842 vs main's #5568: one path, apply_color, tool-gated as #5842
has it, with #5568's float fill, kept fill opacity and lock skip;
shape_fill_ui's duplicate foreground_changed/gesture dropped; #5568's
tests run with a shape tool.
- #6230 vs main's #5180: one Type tool path click (path_target), no
second type.attachToPath; vertical type does not start type on a path,
as main has it; main's path_at/path_cursor and canvas arm dropped.
- #5452 moved the shape swatch to shape_paint_ui.rs: main's hex field
(#6201) ported there.
- type_extra_cmds::with_text takes main's dpi form, pub(crate) for
type_area_cmds.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Preserve both progress histories, all independent regression tests and the incoming Mixer Brush and tilt-axis behavior. Integrate the existing PR without rewriting public history.
Co-authored-by: GPT-6 <noreply@openai.com>
Preserve both progress histories, all independent regression tests and the incoming Mixer Brush and tilt-axis behavior. Integrate the existing PR without rewriting public history.
Co-authored-by: GPT-6 <noreply@openai.com>
Preserve both progress histories, all independent regression tests and the incoming Mixer Brush and tilt-axis behavior. Integrate the existing PR without rewriting public history.
Co-authored-by: GPT-6 <noreply@openai.com>
psd_import.rs: main moved the TySh import behind a canonical byte-order
check (#4771); the Txt2 path read and its warning now sit in that block.
gaps.md, scorecard/type.toml: keep both the Type tool path click and
paragraph direction from main and the PSD path round trip from #7962;
docs/scorecard.md regenerated.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts resolved keeping both sides, newest first:
- ROADMAP.md: status line, progress log, revision history
- docs/printing.md: Paper sizes then Positioning the preview
- docs/target-app-parity.md: status line, Print row, revision history
- gpu: the test modules share one GPU_LOCK, and timing and vector_mask
take it too, so one process drives one wgpu device at a time.
- ui-egui: the wgpu tests in pattern_preview_canvas, adjust_preview_gpu,
marquee_autoscroll and layout_perf take gpu_lock().
- affinity compound_limits: the child process selects its test by the
module path (compound_limits::<name>); with --exact, the bare name
matches no test and the child passes without running the check.
- xtask scorecard reads crates/io/tests/it/corpus.rs.
- Docs and comments name the new test paths and the --test it filters.
- Preferences > Integrations: default and web builds showed the section
with two single-option "Classical" dropdowns, "Local models aren't
available in this build" and disabled Download buttons; main hides it
(#204). The model choices are now hidden where no model can run
(prefs::LOCAL_ML_ONLY), and main's hidden-section test is back.
- A model choice saved by a local-ml build (the preferences file is
shared) made every Select Subject, Object Selection box and Remove
Background fail in a default build, with no control left to switch
back. There it now means Classical; local-ml builds stay strict, and
an explicit "model" param still fails.
- models.download / models.remove: the automation gate let a control or
MCP agent start about 1.8 GB of downloads or delete installed models
outside its workspace. Both are now refused like other ambient file
effects; models.list stays allowed.
- Select Subject / Object Selection with a model run as jobs, so "No
subject found" / "found nothing there" never showed. The job result
now gets the same message as the classical path, including the
Object Selection options bar's "try a rectangle" hint.
- local-models.yml pins its third-party actions by SHA, as ci.yml does.
- docs/development.md: Windows local-ml builds fail to link ONNX Runtime
1.28's prebuilt with MSVC 14.42 (unresolved __std_search_1 etc.), and
Linux ones need glibc 2.38 / GCC 13 (Ubuntu 22.04 fails with
__isoc23_strtol).
Tests that fail without the fix: model_cmds
a_model_saved_by_a_local_ml_build_means_classical_in_a_build_without_models,
prefs_ui unimplemented_preferences_are_hidden_from_the_dialog, workspace
local_model_downloads_and_removals_are_not_automation_commands, jobs_ui
a_model_selection_that_finds_nothing_says_so_like_the_classical_one.
Co-authored-by: mighty-programmer <83077551+mighty-programmer@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Merges main (8f09d122d). Conflicts: the replay_save doc comment (main added
file.export.exportAs replay) and the status lines and history rows of
docs/file-format-parity.md and docs/gaps.md; both sides kept.
The docs called FILE-215-19 done and said only Save As and Save a Copy ask.
Photoshop's JPEG Options also has Matte, the progressive scan count
(Scans 3-5) and the size preview, none of which is offered, and Baseline
Optimized writes the same file as Baseline for RGB (4:2:0). The row is now
partial with those gaps named, and the docs say File > Save asks too.
docs/scorecard.md is regenerated.
Adds jpeg_options_ui::tests::the_answer_reaches_the_encoder. Every UI test
used a fake exporter, so dropping `opts.encode.jpeg_format` from
ExportSettings::io_options (the desktop and web save path) left them all
green; this test writes a real JPEG through io_options and fails without it.
Co-authored-by: Michael Higgins <55243596+Higgs32584@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The 20 i18n catalogs: main and the PR both appended a block at the end;
both kept, main's first. docs/gaps.md: main's text with the PR's
TYPE-218-2 change applied (G8 Missing, Evidence 5 done / 4 partial /
0 missing, revision row), dated 2026-10-22. docs/scorecard.md
regenerated with cargo xtask scorecard.
The TYPE-218-2 note now also says PSD doesn't store the paragraph
direction (crates/text psd.rs maps only the vertical WritingDirection),
so a direction set with the new buttons reopens from a PSD as Auto.
docs/localization-parity.md: the Arabic row said paragraph direction has
no UI (TYPE-218-2); it now has the buttons, the RTL caret is still missing.
Co-authored-by: tareqziad1998 <83318513+tareqziad1998@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The 32-bit branch cut the slider to floor(|s| * 255) / 255, which only matches
Photoshop near 25 and 50 %: measured at every whole percent from -100 to +100
on a 32-bit document, Photoshop lowers by 1 - floor(|s| * 256) / 256 and raises
by 255 / (255 - floor(s * 254)) taken to 1/256 and capped at 32767/256 (201 of
201 exact). +100 gave 512x where Photoshop gives 128x, +90 9.8x for 9.44x.
It also kept the HSL saturation unclipped, which is inf at HSL lightness 1 and
0 and negative above 1: (2, 0, 0), red at +1 stop, turned NaN with any edit,
Hue +40 alone included, where Photoshop gives (2, 1.333, 0). The 32-bit branch
now scales the chroma around the lightness instead (same result in gamut),
on the CPU and in the shader, in whole numbers on both. Colorize clamps its
saturation before the 32-bit scaling, so a PSD's out-of-range value renders
the same on the GPU.
Tests (fail without this): thirty_two_bit_saturation_steps_match_photoshop,
thirty_two_bit_hue_saturation_keeps_bright_colours, the GPU parity
hdr_hue_saturation_bright_colours. Photoshop-oracle floor 188 -> 190 of 258,
measured after merging main.
Co-authored-by: Timothy Daly <100327160+timothydaly1@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Merges main through #3283 (Smart Filters: distinct editors, shared
disclosure and stable alpha).
filter_dialog.rs: main's split of the preview into is_smart_edit,
smart_preview_factor and scale_preview_params is kept. The plug-in branch
from #7524 (plugin_cmds::scale_for_preview scales only declared pixel
lengths) moved into scale_preview_params, so it applies to a plug-in run
on its own and to a plug-in recorded as a smart filter.
smart_ui.rs open_editor: main's smart_filter_dialog::target flow and the
shared adjust/filter dialog opening are kept; the Liquify re-open with
recorded strokes (r4) stays ahead of it. The old per-adjustment
edit_filter call is dropped with main's rewrite.