Commit Graph
1803 Commits
Author SHA1 Message Date
UnemarsandClaude Opus 5.5 eca10449ce Merge origin/main into raw-demosaic-choice
docs/scorecard.md regenerated with cargo xtask scorecard (24 of 172); the
Preferences test keeps main's Enhanced Controls rows and the demosaic row;
catalog tails keep both sides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 20:18:37 +02:00
aiongg 94d28535d3 Merge PR #6464: Survive a lost window GPU device: draw nothing, save unsaved work for recovery, close (#3438, #1215) 2026-10-21 18:15:02 +00:00
aiongg 0c18dbff9a Merge PR #6472: fix(ui): preserve shape stroke settings at zero width 2026-10-21 18:14:57 +00:00
vangel76 d5c0b699cb Merge main into filter-mask painting branch 2026-10-21 19:58:20 +02:00
Higgs32584andClaude Opus 5.5 f916c98536 Merge upstream/main into revive/4330-jpeg-options
Conflicts only in the parity docs: status lines take main's text with the
JPEG Options entry (FILE-215-19) on top; scorecard takes main's rows with
FILE-215-19 done and File compatibility 10 / 12 / 5.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:56:32 -04:00
VladimirPozdnyakov 83427c1df1 Type: a box that can't hold its text draws a red + overflow port
- text::TextLayout::overflows: a box's layout drops the overflowing lines, so
  any character past the last line's byte range is dropped content; trailing
  breaks that fit gain their own empty lines and never read as overflow.
- type_tool::draw_overlay: boxed text overflows draw a red + port on the box's
  bottom edge near the right corner half below it, with the cursor-outline
  white rim; hovering it for the tooltip delay paints a card explaining the
  fix (theme tokens, tooltip preferences honoured); leaving clears the hover
  clock and the delay's tail repaints, so the hint never shows late.
- ui.type_box_overflow (serde skip): automation reads the overflow without a
  screen; set each overlay frame, false without a session.
- Tests: text overflows_says_whether_a_box_holds_its_text; ui unit
  the_overflow_port_flags_a_box_that_cannot_hold_its_text (true / fitting
  false / point false); GPU integration tests/type_overflow_port.rs checks the
  red disc on screen and the hover card (skips without an adapter). The tl!
  string is translated in all twenty catalogs per the i18n gate.
2026-10-21 19:51:02 +03:00
bazmarth 4573037531 Merge remote-tracking branch 'origin/main' into feat/polygon-corner-radius
# Conflicts:
#	docs/scorecard.md
#	docs/ui-parity.md
#	scorecard/tools.toml
2026-10-21 16:49:42 +00:00
Gustavo Ziger 89f8eed896 Merge main into feat/zoom-animation-566 2026-10-21 13:48:26 -03:00
Higgs32584andClaude Opus 5.5 4f1ce1ff11 Merge upstream/main into fix/7962-psd-path-text; path text pixel check needs the file's font
docs/gaps.md conflicted: kept main's header and G8 text and added the #7962 notes.

The corpus job renders with the runner's fonts. Without the font Photoshop used, a wider
fallback runs further around the circle (far edge 22 px out, IoU 0.21), so the far edge and
overlap are only compared when the font is installed, as photoshop_kerning_oracles does for
Arial. The start edge and vertical extent are still checked with any font.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:42:20 -04:00
David MannandClaude Opus 5.5 6fcb4d346a Merge origin/main into fix/history-options
Keeps main's Clear History, state ids and History Brush source (#3534, #3536 and
the integration fix-up) together with History Options: states carry both their
id and their visibility; non-linear record keeps the pinned brush source; trim_with
keeps the source-first logic. The rollback log now records the index each state
was dropped at (the brush source is never dropped, so it is not always the front)
and the replaced document, so a rollback puts every state back where it was.
Clear History ends the rollback window. Catalogs: one line per string.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 18:17:35 +02:00
Ratul Paul 7f4e3c9db8 Merge upstream main and reconcile UI progress documentation
Preserve upstream gap and UI parity progress, revision histories and
header notes alongside the UI scale preset updates. Keep existing
translations, tests, contributor and coauthor credits intact.

Validation: 5,489 engine/UI tests passed, 33 ignored; fmt, Clippy, layers,
wasm, scorecard generation/check and panic_hunt passed.
2026-10-21 22:03:30 +06:00
Rene Leonhardt aa715535f3 perf(format): reuse save cache ownership safely
Move cached keys and compressed buffers between saves, and compare weak
allocation pointers without temporary strong-reference updates. Keep
payload budgets and archive bytes unchanged.

Allow fallible tile edits after a cached save. Move pixel storage when
only weak references remain; use a fallible copy for shared storage and
restore the original tile if the copy fails.

Cover cache key reuse, edits after saves at every depth, and weak/shared
tile ownership. Name the fixed revisions behind the existing timings.
2026-10-21 17:49:09 +02:00
David Mann c3f282d837 Merge PR #6472: fix(ui): preserve shape stroke settings at zero width 2026-10-21 17:48:06 +02:00
aiongg a7825b9e0f Integration: regenerate docs/scorecard.md for the batch 2026-10-21 15:47:34 +00:00
aiongg 066aae7233 Merge PR #6206: Performance: a cancelled Gaussian Blur job stops within budget (#6205)
# Conflicts:
#	docs/gaps.md
2026-10-21 15:45:46 +00:00
aiongg 86eb4e6739 Merge PR #3516: scorecard: five rows catch up with work already on main
# Conflicts:
#	docs/scorecard.md
#	docs/ui-parity.md
2026-10-21 15:45:33 +00:00
aiongg cbc091dd68 Integration: .act colour tables in the parity doc's presets table, for #5407 2026-10-21 15:45:17 +00:00
aiongg 77557d75f1 Merge PR #8229: Integration batch: 8 PRs on main
# Conflicts:
#	crates/engine/src/layer_style.rs
#	crates/io/src/psd_export.rs
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
2026-10-21 15:45:07 +00:00
Jason DandClaude Opus 5.5 a8e5cb3e8e PSD: drop a kept merged-transparency marker when the composite is opaque
A marker kept from the opened file (Photoshop's Mtrn/Mt16/Mt32 PSDs, or
the MTrn of its layered TIFFs) was written back verbatim. Saved with an
opaque composite and an alpha channel, the file has a positive layer
count and the marker, so it reopened with that alpha channel taken as
the merged transparency, and the channel was gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 11:36:31 -04:00
7b7b6c930d PSD: recognise Photoshop's MTrn merged-transparency marker
Photoshop 27.11 saves a layered TIFF with Save Transparency as an RGBA
composite whose layer data has a positive layer count and an `MTrn`
block (`nrTM` in an II file). The specification's key is `Mtrn`, so the
composite's transparency opened as an extra alpha channel and a PSD save
wrote it twice.

TaggedBlock::is_merged_transparency_marker lists Mtrn, MTrn, Mt16 and
Mt32; PsdFile::merged_has_alpha and the PSD exporter's layer-block
placement use it.

Split from #7415; the work started in #3121.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Zer0C00L01 <12090083+Zer0C00L01@users.noreply.github.com>
2026-10-21 11:36:31 -04:00
Korg1ch 76e4e81e33 fix(ui-egui): outline the slider knob in the light themes (#7927) 2026-10-21 18:28:10 +03:00
Michael Higgins 968d8db4e1 Merge branch 'storytold:main' into fix/7524-plugin-preview-px-scale 2026-10-21 11:22:01 -04:00
Branch Sync 48d2fb45bd Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:54 -04:00
Branch Sync 960d927a37 Merge remote-tracking branch 'refs/remotes/upstream/main' into HEAD 2026-10-21 11:18:25 -04:00
Jason White 0cc7bba44c fix(atn): import a recorded Save As with its destination (#7102)
The save event was mapped with no fields, so every Save As in an .atn
came in as a plain File > Save. Playing it wrote over the file the action
was played on and never wrote the recorded output.

Save now reads As, In and Cpy. A destination that's a file of the
recorded format imports as file.saveAs, or file.saveACopy for As a Copy.
A folder destination, an unknown format or an extension that doesn't
match stays a kept Photoshop step, so playback stops before writing
anything. Folder saves can map once the {folder, extension} step from
Save As steps now export to .atn too instead of being skipped.
2026-10-21 16:11:11 +01:00
fjamespriceandClaude Opus 5.5 49df3fb921 perf(camera-raw): develop the preview's per-pixel stages on the GPU (#6916)
Step 1 of #6916: one wgpu fragment pass for develop's per-pixel stages
(white balance and exposure, Contrast without Texture or Clarity, Whites
and Blacks, Vibrance and Saturation, tone curves, Color Mixer, Color
Grading, vignette, grain in full-resolution coordinates).

- algo: camera_raw::per_pixel resolves those stages' constants and
  tables; the CPU develop builds its own from the same functions, so its
  output is unchanged bit for bit.
- gpu: CameraRawDevelop (camera_raw.rs, camera_raw.wgsl), curves and
  Whites/Blacks rows in one R32Float table texture, readback for the
  histogram and scopes. Built on demand, not with the compositor (#6419).
- ui-egui: the proxy worker develops on the GPU when the settings have no
  spatial stage; Rendering Mode CPU, no GPU canvas, a software adapter, a
  fault or a failed develop use the CPU develop. The pipeline builds on a
  thread at the first open. describe() reports developMs and
  developBackend.

GPU vs CPU at 8, 16 and 32 bits: at most 2.7e-5 (RTX 5060 Ti, Vulkan and
DX12), 6.7e-6 (WARP); tests hold 1/4096. 858x572 proxy, release: CPU
20.7-28.1 ms, GPU 2.7 ms.

Part of #6916.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 11:10:13 -04:00
Michael Higgins 74aadae69e Merge branch 'storytold:main' into fix/688-windows-symbols 2026-10-21 11:09:33 -04:00
Reynold Hu b2611ce846 docs: list the canvas-size page in troubleshooting 2026-10-21 22:28:07 +08:00
Reynold Hu 8d7b5324ef docs: answer the Canvas Size white border question (support) 2026-10-21 22:28:07 +08:00
52c1e211d1 Integration: one undo step per Color panel gesture, no Move tool recolouring (#5842)
A drag in the Color panel's field or sliders only reaches the panel after
its press frame (egui decides click vs drag on a later frame), so
`continuing()` was always true on a drag's first pick and the drag reused
the previous pick's history key: a swatch, click or earlier drag followed
by a drag became one undo step. The key is now the pointer's press time,
as `type_tool::drag_key` does; swatches, the Color Picker and clicks get
a fresh key. The kittest `color_panel_gestures_recolour_the_selected_shape_in_separate_steps`
drives real clicks and drags (the first drag joined the click's step
before). CodeRabbit flagged this on the PR.

The R, G, B, HSB and hex fields apply every keystroke, so typing "128"
into G with a shape selected left three undo steps (1, 12, 128). While
no button is held, picks now share the focused field's step; a focus
counter (`track_focus`, run by the panel each frame) makes a value typed
after refocusing a field a new step, and a click (a release frame) is
always its own; a sum (`2*64`) committed by Enter, after the field let go
of the focus, keeps the step of the field focused last frame. Pinned by `typing_an_rgb_value_recolours_the_selected_shape_in_one_step`
(5 steps instead of 3 for "128" before).

With the Move tool (the default tool), Photoshop only changes the
foreground when a colour is picked; the PR recoloured the selected type
and shapes too, so a colour picked to paint with later rewrote them. The
Move tool now joins `other_tools_only_change_the_foreground`.

Co-authored-by: baz <57290335+bazmarth@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 16:25:52 +02:00
Aditya VishwakarmaandClaude Opus 5.5 ef2d8b1a7d docs(architecture): requirements, not pins; Cargo.lock has the exact versions
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 18:54:16 +05:30
PerchAnton 44d37f98c6 Merge main and resolve automation path documentation conflict 2026-10-21 16:21:28 +03:00
Aditya VishwakarmaandClaude Opus 5.5 c8ffb9a8b0 docs(architecture): drop references to the removed rust-framework-options.md
The guide pointed to rust-framework-options.md, which is no longer in the
repo, for version pinning and the UI toolkit choice. Say where versions are
pinned, and drop the two open decisions this document already records as
made (egui/eframe on wgpu; the WebAssembly plug-in API).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 18:46:30 +05:30
jonathanwxh-cellandClaude Opus 5.5 171f612337 Keep Batch results when the action saves and then closes the document
Batch dropped recorded Save / Save As / Save a Copy steps and saved the
active document after the whole action, so "..., Save As, Close" failed on
every file, and a Close that left another document active saved that one
instead. Treat a recorded save as marking the result (Photoshop's "Override
Action 'Save As' Commands"): write the document as the save found it when it
is closed or another document is active at the end, else save it after the
action as before (#3058). Droplets keep the save steps too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 20:38:27 +08:00
9a6b3cb3bc Integration: merge main, resolve conflicts with #6913's split warps (#5769)
Main's quiltWarp support (#6913) rewrote the same placed-warp code the
cylinder warp touches. Kept main's split-warp read and write
(warp_head, quiltWarp, sold_warp) and added the cylinder to it:
warp_head writes `warpValues` for a cylinder, placed_frame frames a
cylinder's mesh as well as any valid custom mesh, quad_points uses
perspective_frame of the warp the block stores, and parse_smart_perspective
reads `quiltWarp` before `warp`, as parse_placed_warp does, so a projective
placement is framed by the warp that is imported.

Co-authored-by: alvarohn <32224796+alvarohn@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 14:29:59 +02:00
Higgs32584andClaude Opus 5.5 20c9dec174 Plug-ins: an unknown "unit" is unitless, not a manifest error (#7524)
Unknown manifest fields were always ignored, so a plug-in may already
carry any "unit" value; failing its install would break it. Anything but
"px" (an unknown string, a number, null...) now reads as "none", as when
the field is absent. The plug-in loader has no warning channel, so this
stays silent.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 08:10:16 -04:00
Higgs32584andClaude Opus 5.5 65f38bf3ed Plug-ins: scale "unit": "px" params on a reduced live preview (#7524)
A filter plug-in's live preview runs on a reduced copy of a large
document, but its params only went through the built-in name list, so a
pixel length with another name (Chromatic Aberration's Amount) previewed
2-4 times too large, and a unitless `size` or `radius` was divided.

number and int params now take an optional "unit" ("px" or "none", the
default; anything else is a manifest error). The preview divides px
params by the reduction (defaults included, ints rounded, kept in range)
and limits the factor so a px param with a positive minimum never drops
below it. Unitless params are never scaled.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 08:00:57 -04:00
David MannandClaude Opus 5.5 1ff7487333 Integration: merge main, resolve conflicts (#5249)
docs/file-format-parity.md: kept main's status line and PSD row, re-applied
the PR's smart filter additions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 14:00:56 +02:00
Rene Leonhardt eb7e497aaf perf(compression): decode compressed slices without buffering
Use the buffered-input decoders directly for Affinity zlib entries, deep
EXR ZIP chunks and SVGZ data already held in memory. This avoids a 32 KiB
input allocation and copy per decoder.

Keep output limits and checksum handling, with coverage for truncated
EXR streams and concatenated SVG gzip members.
2026-10-21 13:59:34 +02:00
Rene Leonhardt df6a7e7b5a perf(format): reduce ZIP archive allocations
Reserve complete bundles and directories from compressed sizes, and borrow
UTF-8 entry paths in the lookup index. Preserve lossy names and first-entry
lookup for duplicates.

Check ZIP field lengths before writing, bound metadata reservations, and
cover byte equivalence, overflow and incremental saves. ZIP entry paths
have a format limit independent of filesystem path constraints.
2026-10-21 13:59:34 +02:00
FartmanAndBurps 755ca9e2a0 feat(print): add interactive preview positioning
Drag the visible image in the print preview using paper-scaled egui points.
Switch Center to manual without moving the grab point, allow signed Top/Left
offsets, and retain the shared preview/PDF layout and mirrored behavior.

Add regression coverage for negative PDF placement, native HiDPI dragging,
centering, clipping, scaling, fit, mirroring and invalid geometry.

Validation: 25 engine print tests, 19 file-dialog unit tests, four print-dialog
integration tests and the adversarial-command test pass. Formatting,
all-target clippy, desktop check/build and layer checks pass.
Three existing socket-binding tests are sandbox-blocked and excluded from
the successful print-suite rerun. GUI capture and wasm checks remain limited
by the environment.
2026-10-21 12:31:08 +01:00
SimoneRecchia 729e5c68ed feat(ui): Photoshop Fill/Stroke popover and full Color Picker for every colour swatch
The shape Fill and Stroke swatches (options bar and Properties) opened egui's
built-in picker, which only has RGBA fields and no hex. They now open
Photoshop's popover: No Color, Solid Color, Gradient and Pattern along the
top, the Color Picker button at the top right, Recently Used Colors and the
swatch library's folders. Gradient applies a gradient preset to the selected
shape; Pattern is shown but off, since shapes don't render pattern paint yet.

The Color Picker button opens the full Color Picker dialog (HSB, RGB, Lab,
CMYK, hex, eyedropper) titled Color Picker (Fill Color) / (Stroke Color),
with a live canvas preview; OK is one undo step (shape_fill_ui::open_paint).

Every other colour swatch built on widgets::color_edit_button* (Photo
Filter, Black & White tint, Gradient Map stop, Content-Aware Fill overlay,
Filter Gallery glow, Save for Web colour table) now opens the same Color
Picker dialog instead of egui's picker; OK hands the colour back to the
swatch through color_picker_ui::widget_tick.

Recently Used Colors are kept in Preferences::recent_colors (newest first,
15), filled by the Color Picker's OK and by popover picks.
2026-10-21 10:54:46 +00:00
David MannandClaude Opus 5.5 60cd4ad099 Address CodeRabbit review: scope the Gaussian Blur speedup claim
The uncancelled speedup is for layers with locked transparency only, the
numbers are local runs and the perf baseline is not re-measured yet.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:26:07 +02:00
David Mann d073b42290 Merge remote-tracking branch 'origin/main' into perf/p25-blur-cancel 2026-10-21 12:24:58 +02:00
David MannandClaude Opus 5.5 a67b6ed5ca Address CodeRabbit review: narrow two coverage claims, cite evidence as file:line
BUG-207-5: only eight retouch tools are tested to follow the Channels panel target (Healing,
Spot Healing, Sponge and Remove are skipped by changes_gray). BUG-208-4: the Polygonal Lasso test
keeps the selection for Shift or Alt and commits a Shift polygon; no test commits an Alt one.
The notes this branch changes now cite file:line, as docs/development.md asks; ui-parity.md gets
a dated row for the marquee Shift+Alt test instead of rewriting the 2026-10-11 one.
Regenerated docs/scorecard.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:24:49 +02:00
David MannandClaude Opus 5.5 d3a5c28904 Merge main into docs/scorecard-stale-rows-2
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 12:23:19 +02:00
Marco Arnulfo 562601eb47 Save for Web: Width, Height, Percent and Resample in Image Size, linked in proportion (#6388) 2026-10-21 11:40:38 +02:00
Marco Arnulfo eabd5c1398 Crop tool: right-click on a pending crop opens its menu: presets, overlays, Cancel and Crop (#6561) 2026-10-21 11:39:53 +02:00
David Mann b68b64ccb5 Merge PR #6160: feat(psd): editable Render smart filters (Clouds, Difference Clouds, Fibers, Lens Flare)
# Conflicts:
#	docs/file-format-parity.md
2026-10-21 11:37:14 +02:00
David Mann 86811ddeee Merge PR #6002: Stroke: keep Overprint (overprint)
# Conflicts:
#	crates/engine/src/layer_style.rs
#	crates/ui-egui/src/layer_style.rs
#	docs/file-format-parity.md
2026-10-21 11:36:58 +02:00