Commit Graph
1803 Commits
Author SHA1 Message Date
David Mann a492716367 Merge PR #5990: Bevel & Emboss: keep the Gloss Contour's Anti-aliased (antialiasGloss) 2026-10-21 11:29:05 +02:00
David Mann 27b8d133d8 Merge PR #4771: Fix mixed-order layered TIFF type geometry and unsafe text fallback 2026-10-21 11:28:23 +02:00
David Mann 4cfb576ee0 Merge PR #4496: .atn: a pinned corpus of real action sets, with byte-exact and load/save/reload tests (#219) 2026-10-21 11:28:19 +02:00
paulou-jpgandClaude Opus 5.5 b1a939f265 Mode dropdowns for Clone Stamp, Pattern Stamp, History Brush, Healing and Paint Bucket
Photoshop gives these painting tools a Mode in the options bar; here they
always painted in Normal.

- Clone Stamp, Pattern Stamp and History Brush offer the layer modes, and
  Healing its own list (Normal, Multiply, Screen, Darken, Lighten, Color,
  Luminosity). The mode is kept in each tool's own brush, like its size,
  and reaches the live stroke and the commit.
- Paint Bucket: paint.bucket takes "mode" (any blend mode, or "clear" to
  erase the filled area). algo's bucket fill gains a FillMode for it. The
  options bar's Mode has Clear after Dissolve, as the Brush's does.
- A tool's first brush now starts in Normal instead of inheriting the
  previous tool's mode, so a Multiply Brush no longer makes the first
  Clone Stamp stroke multiply.
- The Shift+Alt letter and Shift+Plus/Minus mode keys reach these tools,
  within each tool's menu. Tools with no blend mode (the Erasers, Mixer
  Brush, Dodge, Burn, Sponge) now pass the keys to the selected layers.

Not yet: Healing's Replace mode, and a Mode for Spot Healing, Color
Replacement, Blur, Sharpen and Smudge (they ignore the keys meanwhile).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 01:23:22 -07:00
paulou-jpgandClaude Opus 5.5 5430f29e21 Blend mode and number keys work while a transform or warp is open
With a Free Transform box, Puppet Warp or Perspective Warp open, Shift+Alt
letters, Shift+Plus/Minus and the number keys go where the active tool sends
them (the Brush's mode and opacity with the Brush, the layer's with the Move
tool) and never close the box. Puppet and Perspective Warp no longer swallow
those keys.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 01:22:29 -07:00
paulou-jpgandClaude Opus 5.5 909c034686 Blend mode keys: Shift+Alt+letter picks a mode, as in Photoshop
Shift+Alt plus Photoshop's letter (N Normal, M Multiply, S Screen, O Overlay,
R Clear, P Pass Through...) sets the blend mode. With the Brush, Pencil or
Gradient it sets that tool's mode and never the layer's; with a non-painting
tool it sets every selected layer in one undo step. Pass Through applies to
groups only, Clear to Brush and Pencil only, and the Background is skipped.
The typed letter wins, so German Z is still Pin Light; the physical key is
the fallback for the characters Option types on a Mac.

Shift+Plus/Minus now also step every selected layer, and Brush/Pencil
cycling includes Clear after Dissolve, as in the options-bar dropdown.

Fixes Shift+Alt+tool letter switching tools: the tool-letter loop's
consume_key ignores extra modifiers, so blend_keys now runs before it.

Not yet: Behind (Shift+Alt+Q does nothing), and the painting tools without
an options-bar Mode (Clone Stamp, Healing, Paint Bucket...) ignore the keys.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 01:22:29 -07:00
David Mann f6f93838d8 Merge main into fix/history-options 2026-10-21 09:51:06 +02:00
VishnuByrraju a8b7d2bbca docs(parity): Crop rows in ui-parity.md match the code and the scorecard (#6562) 2026-10-21 12:27:12 +05:30
Higgs32584andClaude Opus 5.5 020784da62 PSD: type on a path opens on its path and saves back into the file's Txt2 (#7962)
Photoshop keeps a path-text layer's path only in its Txt2 frame (EngineData
calls it a text box the size of the path's bounds), so it opened as
paragraph text. The frame (kind /2 /0 = 2) holds the path as a flat list of
cubic segments at /1 /0, mapped to the TySh text space by /2 /2.
apply_txt2_path reads it into TextShape::Path (a closed path starting at its
last anchor, as Photoshop sets it); malformed or hostile frames keep the
box/point shape with an import warning.

build_txt2 writes a path layer's path into its object's frame (Photoshop's
own frame left byte for byte when the path is unchanged; flip and a moved
start written into the path), and a layer taken off its path loses its path
frame. A new document still saves path text as point text.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 02:32:12 -04:00
jonathanwxh-cell c5e25bba8f Merge current main and validate document activation replies 2026-10-21 14:12:39 +08:00
VishnuByrraju 6b99ac877c fix(automation): doc.replaceSmartObject replaces Smart Object contents from the read root (#8061)
layer.smartObjects.replaceContents takes an ambient path and is refused in
serve/mcp. Add the capability-scoped sibling of doc.place: the file is read
beneath --automation-read-root and handed to the command's own core, as an
RPC method (doc.replaceSmartObject) and an MCP tool (doc_replace_smart_object).
2026-10-21 11:04:23 +05:30
aiongg b1e408d28f Merge the smart-filter track (#7066 #6398 #6397 #6297 #6299 #6301 #6303 #6315 #6305 #6317)
# Conflicts:
#	docs/file-format-parity.md
2026-10-21 05:04:04 +00:00
aiongg a2c56f960f Integration: gaps.md preferences count from the regenerated scorecard, for #6208 and #6211 2026-10-21 05:04:04 +00:00
aiongg 8e04e6f21e Integration: regenerate docs/scorecard.md for the batch 2026-10-21 05:04:04 +00:00
aiongg 2a1ac6a6fb Merge PR #6208: Preferences: Save in Background off saves in the foreground (#6207)
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
2026-10-21 05:04:04 +00:00
aiongg 050caf9ecd Merge PR #6681: Content-Aware Move: live preview for large selections (TOOL-213-4, #6680)
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/target-app-parity.md
2026-10-21 05:04:04 +00:00
aiongg 4804148ff9 Merge PR #3759: Pattern Stamp and Background Eraser draw live; Spot Healing shows its heal area (TOOL-213-7, #3754)
# Conflicts:
#	docs/gaps.md
#	docs/target-app-parity.md
2026-10-21 05:04:04 +00:00
aiongg f163e3ce0b Merge PR #6211: Zoom tool: hold to zoom continuously with Animated Zoom on (#6210)
# Conflicts:
#	docs/gaps.md
#	docs/scorecard.md
#	docs/ui-parity.md
2026-10-21 05:04:03 +00:00
aiongg fc371711e6 Merge PR #5847: Shapes: Density and Feather on shape layers (#5846)
# Conflicts:
#	docs/scorecard.md
#	docs/target-app-parity.md
#	docs/ui-parity.md
2026-10-21 05:04:03 +00:00
aiongg c23a6c9b90 Merge PR #6206: Performance: a cancelled Gaussian Blur job stops within budget (#6205)
# Conflicts:
#	docs/gaps.md
2026-10-21 05:04:02 +00:00
aiongg 4699d3605c Merge PR #7026: Automation: place and layer/data-set export by index keep the active document (#7025) 2026-10-21 05:04:01 +00:00
Khawar Zamman Wani 7aaed6de0d Merge remote-tracking branch 'origin/main' into feat/6000-color-panel-modes 2026-10-21 10:09:04 +05:30
Khawar Zamman Wani 8fe053bfe6 Merge remote-tracking branch 'origin/main' into save-for-web-webp
# Conflicts:
#	docs/file-format-parity.md
2026-10-21 10:06:35 +05:30
Khawar Zamman Wani 0dfa3bc0b7 Merge remote-tracking branch 'origin/main' into fix/6501-multi-layer-free-transform
# Conflicts:
#	docs/gaps.md
2026-10-21 10:06:22 +05:30
Ratul Paul f09ad572e3 Merge upstream main and retain contributor credits
Preserve all new upstream contributor entries alongside Ratul’s existing
credit. Keep the UI scale presets, translations, tests, documentation,
scorecard and coauthor history intact against current main.

Validation: 5,347 engine/UI tests passed, 33 ignored; fmt, Clippy, layers,
wasm, scorecard generation/check and panic_hunt passed.
2026-10-21 09:47:51 +06:00
Gustavo Ziger e41df200b4 Merge main into feat/zoom-animation-566 2026-10-20 23:29:13 -03:00
jlangeandClaude Opus 5.5 f3ede6136b Print: the printable area turns with the paper (#7782)
#7847 added Portrait and Landscape to the Windows Print dialog. A turn took the
settings and the paper from file.print.page but kept the portrait printable
area, so Scale to Fit Media refused the turned sheet. It now takes the area
from the same answer, or drops it. The engine reads the driver's area through
settings_for_layout, the same turn print_windows makes, so a landscape layout
on portrait settings fits the landscape area.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-21 03:47:38 +02:00
durtyrobbin 56d3e16940 Integrate current Mixer Load and Clean controls and clear every completed job preview 2026-10-20 21:41:31 -04:00
aiongg c633674b6d Integration: one smart-filter count (41 plus Hue/Saturation, Perspective Warp, Filter Gallery and Camera Raw) in the parity doc and FILE-215-2, for #6317 2026-10-21 01:21:19 +00:00
aiongg af3dff34a6 Merge PR #6317: PSD: Mezzotint and Color Halftone smart filters open and save like Photoshop (#6316)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:18:35 +00:00
Higgs32584andClaude Opus 5.5 a1b5ecd16c Merge upstream main into fix/688-windows-symbols
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 21:18:24 -04:00
aiongg 2c87bd630b Merge PR #6305: PSD: Offset and Custom smart filters open and save like Photoshop (#6304)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:17:09 +00:00
aiongg 2c0d232083 Merge PR #6315: PSD: Wind, Extrude and Tiles smart filters open and save like Photoshop (#6314)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:16:28 +00:00
aiongg 7c92cb988c Merge PR #6303: PSD: Diffuse, Trace Contour, Crystallize and Pointillize smart filters open and save like Photoshop (#6302)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:11:06 +00:00
aiongg 9fbb648f8a Merge PR #6301: PSD: Smart Sharpen and Dust & Scratches smart filters open and save like Photoshop (#6300)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:09:51 +00:00
aiongg 95256cc86a Merge PR #6299: PSD: Surface Blur, Smart Blur and Radial Blur smart filters open and save like Photoshop (#6298)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:09:08 +00:00
aiongg c7ece37b15 Merge PR #6297: PSD: parameterless smart filters (Blur, Sharpen, Find Edges, Solarize…) open and save like Photoshop (#6296)
# Conflicts:
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:08:09 +00:00
aiongg 3a3796af05 Merge PR #6397: PSD: Perspective Warp smart filters open and save like Photoshop (#6268)
# Conflicts:
#	crates/io/src/smart_map.rs
#	docs/file-format-parity.md
#	docs/scorecard.md
#	scorecard/file_compat.toml
2026-10-21 01:07:59 +00:00
durtyrobbin 38826b8369 Keep mixer preview limits out of commands and discard stale prepared strokes 2026-10-20 21:07:21 -04:00
aiongg 61ef780550 Merge PR #6398: PSD: Hue/Saturation smart filters open and save like Photoshop (#6267) 2026-10-21 01:07:14 +00:00
aiongg d1bed2f98d Merge PR #6644: Hue/Saturation: the Lightness track runs black, grey, white (#6539) 2026-10-21 01:06:14 +00:00
aiongg 5d1f3ec479 Merge PR #5109: Tests: generated large-file fixtures and a P20 number (#5107)
# Conflicts:
#	docs/scorecard.md
2026-10-21 01:06:10 +00:00
aiongg 5c9ba773b4 Merge PR #3516: scorecard: five rows catch up with work already on main
# Conflicts:
#	docs/scorecard.md
2026-10-21 01:06:08 +00:00
bazmarth def14b0e6b Merge remote-tracking branch 'origin/main' into feat/apply-color-to-selection
# Conflicts:
#	docs/ui-parity.md
2026-10-21 01:03:21 +00:00
jonathnwxh 87978566b7 Merge main preserving CSH limits and larger ABR imports 2026-10-21 09:00:18 +08:00
Higgs32584andClaude Opus 5.5 50a745bfce docs: scorecard rows for FILE-215-19 on top of main's regenerated file
The merge with main took main's generated docs/scorecard.md. It is
brought back in line with scorecard/file_compat.toml (FILE-215-19 done):
File compatibility 8 done / 14 partial / 5 missing, and the FILE-215-19
row with its status and note. Edited by hand to the generator's row
format, since `cargo xtask scorecard` isn't run locally; CI's
`cargo xtask scorecard --check` verifies it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 20:59:59 -04:00
Higgs32584andClaude Opus 5.5 7cef41bba2 Merge upstream/main into fix/iris-xe-texel-guard
Conflict in apps/photocraft/src/main.rs: main added
`app.perf.gpu_info.set_available(&rs.available_adapters)` where this branch
installs the texel guard; both are kept (set_available first, then
texel_guard::install).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 20:55:58 -04:00
Higgs32584andClaude Opus 5.5 c00045d7d9 Merge upstream/main into fix/7537-windows-arm-dx12
Resolve conflicts with #4's "Auto on Windows leaves Vulkan out when an
Intel adapter is present" (3c9c93ed) and #7813's adapter choice
(`configure` gained `wanted`):

- gpu_startup.rs: `intel_dx12_applied(.., vulkan_left_out)` from main and
  the patch's `dx12_default_applied` become one
  `dx12_default_applied(adapters, chosen, os, vulkan_left_out)` that
  returns the maker's name (Intel or Qualcomm). `vulkan_left_out` counts
  only for Intel, since only an Intel DXGI adapter makes
  `windows_auto_backends` drop Vulkan. `configure` keeps main's `wanted`
  parameter and Vulkan-free instance; the System Info note names the maker.
- Tests: keep both main's Intel instance test and the Qualcomm test,
  updated to the merged signature, plus one assertion that Vulkan being
  left out doesn't make a Qualcomm DX12 pick "the default".
- Module docs and docs/development.md: main's wording, with Qualcomm
  (Windows on ARM) added to the DX12 default.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 20:55:06 -04:00
Higgs32584andClaude Opus 5.5 5eac93bf23 Merge upstream/main into revive/4330-jpeg-options
Main moved on (integration batch #8095 and others). Two conflicts:
- docs/gaps.md revision history: both rows kept, newest first.
- docs/scorecard.md (generated): main's version taken. It needs
  `cargo xtask scorecard` again: with FILE-215-19 done, File
  compatibility reads 8 done / 5 missing rather than main's 7 / 6.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 20:47:00 -04:00
aiongg b097800e78 Merge pull request #8095 from aiongg/integration-7
Integration batch: 9 PRs on main
2026-10-20 20:44:51 -04:00