Commit Graph
1803 Commits
Author SHA1 Message Date
Jeremy YaoandClaude Opus 5.5 a0f29d4cc2 Merge branch 'main' into feature/animation-effects
Brings in 2794 commits from main (98de85c6). Resolved as the PR review
suggested:
- wheel_nav.rs, canvas.rs, panels.rs: main's read_with(.., smooth,
  touch_gestures) stays, and its callers (the canvas's two wheel reads and the
  Navigator) pass the resolved Animation Effects value,
  !app.prefs_rt.animations_off, instead of the removed
  interface.enable_animations. That flag works in every window, a second OS
  window for a document included; unsmooth stays for the main window's panels
  and lists.
- apps/photocraft/Cargo.toml: main's NSGraphics feature (Beep When Done) next
  to this branch's NSAccessibility and NSWorkspace.
- docs/scorecard.md is regenerated; the UI-217-10 note says where the glide
  is taken out now.
- French and Russian gained their own "On" entries on main, so this branch's
  copies are dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 18:33:59 -04:00
David MannandClaude Opus 5.5 72bafe9d25 Address CodeRabbit review: Type checklist counts match the scorecard (#6230)
The Features row said Type 5 / 4 / 1 and "RTL paragraph direction UI
missing"; scorecard/type.toml has 5 done / 5 partial / 0 missing, as the
status line says, and TYPE-218-2 is partial: the direction buttons exist,
the visual RTL caret is missing.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-23 00:28:19 +02:00
David MannandClaude Opus 5.5 b54ab8ff30 Address CodeRabbit review: bridge-mode doc_replace_smart_object refuses index (#8150)
The bridge forwards Replace Contents to the app, which runs it on its
active document, so a given `index` was silently dropped and could replace
another document's contents. It is now refused before anything reaches the
app, as bridge previews and saves already do; documented in the schema and
control-protocol.md. A fake-app test checks the indexed call never arrives.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-23 00:25:18 +02:00
David MannandClaude Opus 5.5 30d3db752b Merge origin/main into fix/history-options
Main's keep-clean revision bump (#6865) now also applies to rollback; Turkish History terms follow main's Geçmiş.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 00:07:59 +02:00
eiketre bd74b7fef9 Merge upstream main into fix/multilayer-transform-handles 2026-10-22 23:57:50 +02:00
SimoneRecchia 812aea6807 Merge remote-tracking branch 'upstream/main' into claude/busy-ptolemy-02a3az
# Conflicts:
#	docs/ui-parity.md
2026-10-22 21:56:39 +00:00
David Mann 1efa06b715 Integration: merge main (c36e46c38 #8680, #8668, #6705)
# Conflicts:
#	docs/ui-parity.md
2026-10-22 23:47:54 +02:00
David Mann ca73fb4724 Merge PR #6966: perf(canvas): skip occluded checker on CPU textures 2026-10-22 23:40:20 +02:00
David Mann 7ecac105c2 Merge PR #8556: perf(oil-paint): drop the libm floor/round calls from the LIC gathers, same pixels (1.23x) 2026-10-22 23:40:19 +02:00
David Mann 7c9d6ac344 Merge PR #8150: fix(automation): doc.replaceSmartObject replaces Smart Object contents from the read root (#8061) 2026-10-22 23:40:19 +02:00
David Mann 8d23a06eae Merge PR #6094: Fix legacy PSD point-text placement after font resolution 2026-10-22 23:40:19 +02:00
David Mann c436f61d53 Merge PR #7202: fix(atn): import a recorded Save As with its destination (#7102) 2026-10-22 23:40:18 +02:00
David Mann 3fdcabded4 Merge PR #5248: Keep adjustment clipping visible in compact Properties panels 2026-10-22 23:40:15 +02:00
David Mann 49a98690ad Merge PR #8354: Keep the CPU canvas sharp at 100% zoom 2026-10-22 23:40:14 +02:00
David Mann 14d68f972b Merge PR #8035: CLI: reject ignored or conflicting mcp/serve launch options 2026-10-22 23:40:13 +02:00
David Mann 837242536b Merge PR #7840: gpu, docs: fix timing test skip guard and document Windows ARM64 build on RTX Spark 2026-10-22 23:40:12 +02:00
David MannandClaude Opus 5.5 494cdb236a Integration: batch tests join the io test binary, regenerate the scorecard
Main's #8644 builds each crate's integration tests as one binary; #3356's
cmyk_export.rs and #5769's cylinder_warp.rs move into crates/io/tests/it.
docs/scorecard.md regenerated for the batch (#5485 DIST-220-1, #6055
UI-217-17, preferences).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:40:12 +02:00
David Mann fff01d8918 Integration: stack #7335 (its merge onto main, conflicts resolved) 2026-10-22 23:40:11 +02:00
David Mann 9e7b35b716 Integration: stack #6055 (its merge onto main, conflicts resolved) 2026-10-22 23:40:11 +02:00
David Mann c6e628afad Integration: stack #5815 (its merge onto main, conflicts resolved) 2026-10-22 23:40:10 +02:00
David MannandClaude Opus 5.5 6c7e920d5a Merge PR #7335: Gradient Overlay: add Method selector and retain editable source stops
- crates/ui-egui/src/layer_style.rs: values_of keeps the PR's method/smoothness keys and source-stop ends, and main's (#7072) unconditional From/To and geometry fields.
- crates/compose/src/cmyk_tests.rs (no textual conflict): add the PR's new `interpolation: None` field to main's CMYK test GradientOverlay literal.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:39:14 +02:00
David MannandClaude Opus 5.5 945a10dc7c Merge PR #6055: Color panel: Photoshop's panel-menu modes, the same in every theme (#6000)
Conflicts:
- crates/ui-egui/src/i18n/{cs,de,el,es,fr,hu,id,it,ja,ko,nl,pl,pt-br,ru,sr,tr,uk,vi,zh-hans,zh-hant}.tsv: kept every key of both sides (main's block, then the PR's Color panel block); no duplicate keys.
- crates/ui-egui/src/panels.rs: took the PR's removal of color_picker/hsb_sliders/rgb_sliders (moved to color_panel_ui.rs); kept main's color_field_height doc comment; main's #5842 slider recolour tests ported to color_panel_tests.rs for the new HSB/RGB slider modes; main's black-HSB test dropped as the PR's hsb_sliders_take_values_on_black covers it.
- crates/ui-egui/src/color_panel_ui.rs (no textual conflict, adapted): set_color now goes through apply_color::foreground_changed with the gesture (was type_tool::foreground_changed), so every mode (sliders, ramp, alerts, wheel) recolours selected type/shapes tool-gated in one undo step per gesture; panel() calls apply_color::track_focus.
- crates/ui-egui/src/color_panel_tests.rs (adapted): new every_slider_mode_recolours_the_selected_shape test.
- docs/gaps.md, docs/ui-parity.md: union of both sides' status lines, rows and revision history; the PR's done row replaces the old "missing" Color panel row.
- docs/scorecard.md: generated, took b7-base's version.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:39:04 +02:00
David MannandClaude Opus 5.5 cab3ef6191 Merge PR #5815: perf(doc): share the XMP packet, Duotone PSD data and unsupported adjustment bytes between snapshots
- crates/engine/src/tests.rs: kept both tests (main's restore_layer_selection test and the PR's history_states_share_large_document_payloads).
- crates/io/src/psd_import.rs: kept main's parsed Duotone inks (duotone_map) with the PR's Arc<[u8]> psd_raw; also main's unknown-adjustment-key import (#6575) now builds Arc<[u8]> raw.
- crates/io/tests/adjust_warnings.rs: moved to tests/it/adjust_warnings.rs on main; PR's .into() edits applied there, plus #6322's Color Lookup test (raw.as_slice().into()).
- docs/architecture.md: union; status line names both changes, both revision-history rows kept.
- Adapted main-new sites to the PR's types: psd_export.rs (Duotone write-back via as_deref/to_vec, Unsupported block compare by slice), inspect.rs and ui-egui unsupported_marker_tests.rs (raw .into()), io tests/it/psd_unknown_adjustment.rs (slice compare).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:38:56 +02:00
Gabriel Luís da SilvaandClaude Opus 5.5 0ec95fa266 View › Extras (Cmd+H) hides the Move tool's transform controls (#6699) (#6705)
As in Photoshop, the Move tool's Show Transform Controls box and handles are an Extra: hiding
Extras hides them, and their handles stop responding (no hover cursor, a press doesn't start Free
Transform). Cmd+H again brings them back. Show Transform Controls and the layer are unchanged.

Fixes #6699

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 17:38:53 -04:00
David MannandClaude Opus 5.5 f56147655d Merge PR #5485: Add opt-out startup release checks and manual update status
Conflicts resolved:
- crates/ui-egui/src/i18n/hu.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/i18n/ru.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/i18n/sr.tsv: kept base's added sections, then the PR's update-check keys
- crates/ui-egui/src/i18n/tr.tsv: kept base's Bevel & Emboss keys, then the PR's update-check keys
- crates/ui-egui/src/menus.rs: kept base's saved-workspace entries, then the PR's Help › Check for Updates reordering
- docs/gaps.md: base status line with the PR's G17 clause prepended; PR revision row above base's rows
- docs/target-app-parity.md: base status line (updated 2026-10-22) with the PR's clause prepended; PR revision row above base's rows
- docs/scorecard.md: generated, took b7-base's version

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 23:38:46 +02:00
SimoneRecchia a5d555a3d0 Merge storytold/photocraft main into the Fill/Stroke popover branch
Conflicts:
- vector_ui.rs: main gave egui's shape picker a hex field and a screen
  colour button; this branch replaces that picker with the popover, whose
  Color Picker has both, so the popover version is kept.
- vector_paint_tests.rs: main's zero-width stroke tests are kept; its two
  hex tests now type and paste into the Color Picker the popover opens
  (the test harness draws dialogs, as the app does).
- i18n catalogs: both sides' new strings kept; fr and ru keep main's
  translations of Color Picker, Solid Color and Tint Color.
- paint_picker.rs uses photocraft_color::convert::hsb_to_rgb, which
  replaced color_picker_ui::hsv_to_rgb on main.
- docs: both sides' rows and revision entries kept; scorecard regenerated.
2026-10-22 21:24:19 +00:00
95c3af68c3 Integration: prove doc.replaceSmartObject replaces and undoes (#8150)
The rpc test only checked the returned layer id, so a no-op that echoed
{"layer": id} passed, its undo check passed on doc.place's own step, and
the bad-layer case asserted on an empty reason. It now checks the smart
object's file name and rendered centre pixel (42 -> 200 after the
replace, back to 42 on undo, 200 on redo), that every refusal changes
nothing, and that layer 999999 fails with "no such layer".

The bridge row in docs/control-protocol.md claimed doc_replace_smart_object
maps onto layer.smartObjects.replaceContents; the desktop refuses that
command (ambient path), like doc_place's file.placeEmbedded. The row now
says so and points to the headless / workspace server method.

Co-authored-by: VishnuByrraju <112673081+VishnuByrraju@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 21:36:42 +02:00
249eae743f Integration: make Oil Paint's round_i32 exact for every f32 (#8556)
round_i32 added 0.5 in f32, which rounds up at the binade crossing:
0.49999997 (0.5 - 2^-25) + 0.5 becomes 1.0, so round_i32 gave 1 (and -1 for
the negative) where f32::round gives 0. The sum is now taken in f64, where
it is exact for every f32 the i32 cast does not saturate; still no roundf call.

rounding_matches_the_standard_library now covers +-0.49999997, the ties and
8388607.5, and a new test compares every f32 bit pattern in [-4096, 4096]
against f32::round (0.6 s). Both fail on the previous head. The code comment
and docs/oil-paint-performance.md no longer claim the f32 sum is exact.

Co-authored-by: ebosido444-ai <316167330+ebosido444-ai@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 21:31:24 +02:00
David Mann 1e3323f64c Integration: merge main (#6966) 2026-10-22 21:28:41 +02:00
David MannandClaude Opus 5.5 018d3605b1 Integration: merge main (#6094)
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 21:13:36 +02:00
vangel76andClaude Sonnet 5.5 80753c7f6d Run rustfmt and regenerate docs/scorecard.md after the upstream merge
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-22 21:05:32 +02:00
7a70220777 Integration: one gpu test binary, no GPU pass for neutral settings (#6923)
- crates/gpu/tests/camera_raw.rs was its own test binary taking
  testkit's gpu_lock; since #8644 the crate's integration tests are one
  binary (tests/it) sharing crate::GPU_LOCK, so in that binary it would
  open a device next to the other modules. Moved into tests/it with
  GPU_LOCK; the testkit dev-dependency goes.
- Default (neutral) settings uploaded, rendered and read back the proxy
  although the CPU develop returns at once. CameraRawGpu::develop now
  leaves them to the CPU; neutral_settings_skip_the_gpu_round_trip fails
  without it (backend "gpu").
- docs/hardware-parity.md: the CPU range was one backend's (21-28 ms);
  measured 11-16 ms on an RTX 5070 Ti, so 11-28 ms, machine-dependent.

Co-authored-by: p0rps <134095787+fjamesprice@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 20:45:52 +02:00
durtyrobbin 5bd07b07ed Address mixer review: safe sampling, shared live commits and preserved brush behavior 2026-10-22 14:41:04 -04:00
4b7d41e9c2 Integration: drop unreferenced screenshots, fix doc dates and order (#5248)
docs/images/adjustment-scope-{before,after}.png (232 KB) were referenced
nowhere in the repo (git grep "adjustment-scope-" finds only their
ATTRIBUTION.md row); screenshots belong in the PR body. Remove both and
their ATTRIBUTION.md row.

docs/gaps.md revision history is newest first: move the 2026-10-21 G9 row
below the 2026-10-22 one. docs/ui-parity.md: the compact-dock clipping row
said done (2026-10-20); its own history row and gaps.md say 2026-10-21.

Docs and assets only; no code or test change.

Co-authored-by: bommerts <44821497+bommerts@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-22 20:38:31 +02:00
Khawar Zamman WaniandClaude Opus 5.5 5b0edf4aeb Merge origin/main into fix/8169-huge-tiff-open
Main now builds each crate's integration tests as one binary (#8644), so this
branch's tests/tiff_bands.rs and tests/tiff_banded_import.rs move into tests/it/
and are registered in its main.rs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UmLxt3PeAHUmPEQjSjYqj6
2026-10-23 00:06:23 +05:30
David Mann 894351cd6d Integration: merge main (#6923) 2026-10-22 20:30:42 +02:00
vangel76 1d99a1d8e8 Merge remote-tracking branch 'upstream/main' into fix/3290-filter-mask-paint
# Conflicts:
#	crates/engine/src/float_cmds.rs
#	crates/engine/src/jobs.rs
#	crates/ui-egui/src/smart_ui.rs
2026-10-22 20:15:51 +02:00
6b867deba2 Integration: renumber the Photomerge scenario, measure its peak on every OS (#7873)
- 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>
2026-10-22 20:03:55 +02:00
Lucenx9 4cf1087342 Merge origin/main and address CodeRabbit corpus inventory feedback 2026-10-22 20:02:52 +02:00
durtyrobbin 3233e2ffc9 Merge main while preserving live mixer controls and review fixes 2026-10-22 14:00:00 -04:00
bommerts 6425a23309 Merge main and preserve sharp CPU rendering during animated zoom 2026-10-22 13:58:21 -04:00
a8b23d947e Integration: Dodge, Burn and Sponge keep the blend mode keys off the layer (#5504)
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>
2026-10-22 19:58:16 +02:00
David Mann 9487065314 Integration: merge main (one test binary per crate, #8644)
# Conflicts:
#	docs/file-format-parity.md
#	docs/gaps.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-22 19:55:06 +02:00
Lucenx9 52f438c864 fix(xtask): derive scorecard corpus counts from pinned manifests 2026-10-22 19:45:06 +02:00
e264921076 Integration: Puppet and Perspective Warp keep the blend and number keys (#5478)
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>
2026-10-22 19:41:34 +02:00
eiketre be85bbc030 Merge upstream main into fix/multilayer-transform-handles 2026-10-22 19:36:31 +02:00
bommerts bd195276e9 Merge current main and preserve compact clipping evidence 2026-10-22 13:35:05 -04:00
2f1eacf391 Integration: merge main, resolve conflicts (#5504)
- 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>
2026-10-22 19:28:49 +02:00
David MannandClaude Opus 5.5 f5533e5d82 Integration: merge main into batch 6
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>
2026-10-22 19:20:26 +02:00
David Mann b20d6138cf Integration: merge main, resolve conflicts (#5478)
distort_ui.rs: keep main's Puppet Warp Delete/Backspace pin removal
(#6754) before the PR's key forwarding. docs/ui-parity.md: keep main's
status line, Guides note and revision rows, add the PR's.
2026-10-22 19:15:49 +02:00