Commit Graph
3891 Commits
Author SHA1 Message Date
Trevor Brown dc20b80858 Merge remote-tracking branch 'upstream/main' into feat/artboard-options-bar-11385 2026-11-07 09:39:36 -05:00
Hartmut Nörenberg 76326721f0 Merge remote-tracking branch 'upstream/main' into feat/reset-transform-smart-object-11662 2026-11-07 15:33:24 +01:00
Trevor BrownandClaude Fable 5.1 d52290b05a Magnetic Lasso: the docs say when to rebuild the edge source and what a non-RGB document follows (#11686)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-07 09:26:44 -05:00
DuBearte 688673f22f Merge remote-tracking branch 'origin/main' into fix/11775-count-record-label
# Conflicts:
#	crates/engine/src/cmd.rs
2026-11-07 08:46:20 -05:00
David Mann 67e3457b02 Merge pull request #10001 from indy2kro/feat/8064-psd-maximize-compatibility-param
Saves take maximizeCompatibility for a PSD/PSB's merged image (#8064)
2026-11-07 14:44:52 +01:00
David Mann e18900e5fb Merge pull request #10443 from hectorviov/fix/replace-color-add-subtract
Replace Color: Add to Sample and Subtract from Sample (#6280)
2026-11-07 14:44:38 +01:00
David Mann ae84be356a Merge pull request #10557 from hectorviov/fix/save-for-web-slices
Save for Web: show slices in the preview and export selected slices
2026-11-07 14:44:21 +01:00
David Mann adac9ca7cf Merge pull request #10549 from hectorviov/fix/drag-mask-to-layer
Drag a layer mask onto another layer or group to move it, ⌥ to copy it (#10485)
2026-11-07 14:43:04 +01:00
Trevor Brown c26008dbb0 Merge remote-tracking branch 'upstream/main' into feat/artboard-options-bar-11385 2026-11-07 08:39:30 -05:00
Hartmut Nörenberg 2c96b71cc4 Merge upstream/main into feat/reset-transform-smart-object-11662
`docs/ui-parity.md`'s status line conflicted: the branch and main each
prepended a clause at the head of the change list, and the branch also
carried the newer `Last updated` date. The merged line keeps main's
toolbar tool-memory clause (#3569) word for word after our Reset
Transform clause (#11662), with one `Change:` header and the later date.
2026-11-07 14:22:32 +01:00
David Mann 3c000ea238 Merge pull request #8307 from midasdf/jp/print-paper-sizes
Print: Japanese paper sizes (はがき・往復はがき・JIS B5/B4・L判)
2026-11-07 14:11:19 +01:00
David Mann d4db4d78ad Merge pull request #9075 from indy2kro/feat/8492-skip-transform-when-placing
Preferences: Skip Transform when Placing (#8492)
2026-11-07 14:09:31 +01:00
Trevor BrownandClaude Fable 5.1 6e33cd6483 Merge upstream/main into feat/artboard-options-bar-11385
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-07 06:39:01 -05:00
David Mann 8548ed57a1 Merge pull request #11851 from DuBearte/fix/11771-count-delete-group-first
fix(engine): deleting the current count group makes the first group current (#11771)
2026-11-07 12:11:15 +01:00
David Mann 83eaf7c0bc Merge pull request #11847 from hnoerenberg/fix/pressure-size-default-off-11809
fix(paint): Pressure for Size starts off, as the reference does
2026-11-07 12:10:48 +01:00
David Mann 97c42fb0cd Merge main into #10445 2026-11-07 12:01:30 +01:00
David Mann 9ba029129e Merge pull request #11540 from TrevorBrown-dev/feat/move-options-bar-distribute-gear-11381
feat(move): options bar gets Distribute buttons, the ... icon panel and the gear menu (#11381)
2026-11-07 11:57:35 +01:00
David Mann 339adcb7bc Merge pull request #11322 from Saloouu/fix/toolbar-groups-survive-restart
Toolbar slots and tool keys keep their last tool across launches (#3569)
2026-11-07 11:55:58 +01:00
tomgardenart faac50ea46 fix: preserve selection transfer state 2026-11-07 20:26:55 +13:00
DuBearteandClaude Opus 5.5 39443ab3aa fix(engine): Record Measurements labels a Count tool row "Count N" (#11775)
A row recorded from the Count tool was labelled "Measurement N" like a
selection row. It is now "Count N", as in the reference application,
with the same shared number; selection and ruler rows keep their labels
and every other column is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:04:30 -05:00
DuBearteandClaude Opus 5.5 daf1d48d88 fix(engine): deleting the current count group makes the first group current (#11771)
count.deleteGroup kept the same index current after deleting the
current group, so with three groups and the second current the third
became current. The first remaining group now becomes current, as the
reference application does. Deleting another group by index still keeps
the current one (#5654), and deleting the last group still leaves none.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 01:50:14 -05:00
DuBearteandClaude Opus 5.5 0e0d99d0b2 fix(engine): Magic Wand Subtract and Intersect grow from the seed through the selection (#11779)
Alt-click (Subtract) and Shift+Alt-click (Intersect) with the Magic Wand
took the seed's whole region, wherever the seed was, so a click outside
the selection still cut into it. With Contiguous on, the region now
grows from the seed through selected pixels only: a seed outside the
selection subtracts nothing and intersects to nothing, and a seed
inside gives the same results as before. Contiguous off is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 01:29:32 -05:00
Hartmut Nörenberg ccc263e49e fix(paint): Pressure for Size starts off, as the reference does
BrushSettings::default() turned Pressure for Size on, so a fresh brush -
and the brush Reset Tool hands back, which is that default plus
Photoshop's 10 % smoothing - reported pressureSize: true from brush.get
and drew the options bar's "Always use pressure for size" button
highlighted, while the reference application leaves both pressure
toggles off after Reset Tool. Neither is on now.

The toggle itself is untouched: it still switches both ways, Shape
Dynamics' Pen Pressure control is unaffected, and path.stroke's Simulate
Pressure still tapers a brush that follows pen pressure. A brush JSON
that omits pressureSize now reads as off, as the reference's default is.

Two engine tests took their expectation from the old default and set
pressureSize explicitly instead: cmd::brush_cmds::tests::stroke_backwards_compatible
and cmd::vector_cmds::tests::stroke_path_simulate_pressure_tapers_both_ends.
The new crates/engine/src/brush_pressure_size_default_tests.rs covers the
default, brush.get on a fresh session, an omitted field, switching the
toggle, and that a pressure ramp with the default brush paints like
pressureSize: false.

Fixes #11809
2026-11-07 07:22:59 +01:00
Codex 0df9babc47 Document Move selection and gesture behavior 2026-11-06 22:11:06 -08:00
Hartmut Nörenberg 1475708c14 fix(engine): Reset Transform requires its re-render
Review finding on this PR (#11675, discussion_r4499346688): with the warp now cleared as part of
the reset, a smart object whose stack holds a visible filter this build cannot apply took the
Free Transform path's forgiving branch - `refresh_layer` returns false for that stack,
`refresh_text` drops it on the floor, and `restore_unrendered` put the OLD cache back warped by
the relative map. The step recorded a placement at 100 % with no warp whose pixels still showed
the warp.

The step now insists on the guarded refresh the other smart-object edits use:

- `unapplied_filters` is checked before anything changes, so an unsupported Photoshop filter kept
  verbatim from a PSD names itself in the error and the document is never touched.
- `refresh_or_fail(doc, id)?` runs at the reset boundary, right after `transform_by_map` and
  before the exact map is pinned. It is a cache-warm call in the normal case (same document state
  as the render `transform_by_map` just did), and it refuses an unreadable source or a render that
  fails outright. Because `Session::edit` runs its closure on a copy and returns early on `Err`,
  a refused reset leaves the document, the placement, the warp and the history list exactly as
  they were - the fallback pixels are never accepted.

Regression test `reset_transform_refuses_a_stack_it_cannot_re_render` (red before this commit:
the reset returned Ok) asserts the error names the filter, that transform, warp and filter stack
are unchanged, that no history state was added, and that the same object resets normally once the
unsupported filter is off the stack. The four existing reset tests still pass, so the success
path and its warp clearing are unchanged.

No new dependency; photocraft_io's UNSUPPORTED_FILTER was already re-exported by this module.
2026-11-07 06:17:54 +01:00
yoriswind 488e439714 Preserve native defaults when exporting Displace actions 2026-11-06 20:39:44 -08:00
DuBearteandClaude Opus 5.5 f190d1ba28 feat(compose): Stroke Emboss bevels the stroked outline (#8639)
Stroke Emboss was drawn as an Inner Bevel of the layer, shading the
layer's own edge. It now bevels the outline of the layer with its top
Stroke effect and shades only the stroke, as Photoshop does; without a
stroke it shows nothing. The GPU plan hands a layer with Stroke Emboss
to the CPU compositor, which builds the stroke's band.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:39:34 -05:00
yoriswind 3e56f95366 Map recorded Windows Displace actions 2026-11-06 18:58:13 -08:00
David MannandClaude Opus 5.5 2cb4a88dd6 Brush: opacity minimum 1 % and "00" sets 100 % (#11812)
The Brush, Pencil and Eraser Opacity fields take whole numbers from 1 to
100, as in the reference application (0 and -10 become 1, 150 becomes 100,
33.7 a whole number). The digit keys "00" set the Brush to 100 % instead of
0 %, and tools.setBrush floors opacity at 0.01, so a brush can no longer be
set to paint nothing.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:39:21 +01:00
Hartmut Nörenberg 18a654fb1f fix(engine): Reset Transform clears the warp too
Measured against the reference application on 2026-11-06 (report in #11675): a smart object
warped with Arc 50, then rotated 20 degrees and scaled to 80 %, came back from Reset Transform
with no warp at all, at its contents' own size, unrotated, centred on the average of its four
corners. So the Warp goes with the transform, and the centre is the corner average rather than
the point the contents' box centre maps to - the same point for an affine placement, and the
quad's centre once Distort or Perspective bent it.

The warp is cleared before the placement is re-rendered, so the step draws the unwarped
contents once. What still follows the placement is the Smart Filter mask and any linked layer or
vector mask, exactly as under Free Transform: how a painted filter mask should compensate for a
cleared warp is not something the measurement covers, and #11171 has its own answer to it.

Smart filters, sources and history are unchanged: still one "Reset Transform" undo step. The
tests now pin the cleared warp (red before this commit), the corner average for a distorted
placement, and that a second reset changes nothing.
2026-11-07 02:18:23 +01:00
yoriswind 1ff9efa828 Integrate measured Move selection with current main 2026-11-06 16:27:00 -08:00
David Mann 0f286b57a9 Merge pull request #11252 from NaufalDzz/fix-transform-several-selection-rules
fix(transform): refuse the Background among several layers and apply the box on a selection change
2026-11-07 01:12:41 +01:00
Nostella 386a680422 Transfer selected pixels between tabs and tiled documents 2026-11-07 13:01:13 +13:00
Triwarr d5157dd799 Merge remote-tracking branch 'origin/main' into pdf 2026-11-07 00:27:36 +01:00
yoriswind bb529a0d88 Match measured Move marquee lock eligibility 2026-11-06 14:57:48 -08:00
yoriswind f4dcd435bb Integrate the qualified Move repair with current main 2026-11-06 14:50:36 -08:00
Triwarr 7e1de84bce PDF: document the added test functions
Every function this PR adds now has a doc comment, including the test functions in the importer, PDF export and layers_to_files suites. No behaviour change.
2026-11-06 23:44:59 +01:00
Trevor BrownandClaude Fable 5.1 a475de6139 Merge upstream/main into feat/move-options-bar-distribute-gear-11381
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 17:40:51 -05:00
Trevor BrownandClaude Fable 5.1 fc30b2f6a9 Merge upstream/main into feat/artboard-options-bar-11385
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 17:40:48 -05:00
David Mann 5e2fdf61e2 Merge remote-tracking branch 'origin/main' into HEAD 2026-11-06 23:10:58 +01:00
David Mann 482e167e98 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	docs/ui-parity.md
2026-11-06 22:58:10 +01:00
yoriswind 3f37e56a86 Merge landed main into the Actions review fix 2026-11-06 13:55:27 -08:00
David Mann fd890eaca4 Merge pull request #11669 from davidmann4/feat/crop-task-bar-10890
Crop: Contextual Task Bar under the crop frame, as a reusable task-bar widget (#10890)
2026-11-06 22:49:21 +01:00
David Mann 7ecfccbd64 Merge pull request #11643 from davidmann4/integration-batch-19
Integration batch 19: epic PRs (WIP)
2026-11-06 22:48:55 +01:00
yoriswind 2e210c0aae Scope Actions tool recording guard to the active take 2026-11-06 13:40:05 -08:00
yoriswind a92085c639 Keep Move Auto-Select separate from ordinary layer picks 2026-11-06 13:36:51 -08:00
Trevor BrownandClaude Fable 5.1 70e6b0e7b1 Magnetic Lasso: the edge comes from the visible composite, not the active layer (#11686)
In an RGB document the border now snaps to the edges of the visible composite
whichever layer is active; hidden layers add none. Other modes keep following
the active layer's pixels.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 16:14:14 -05:00
Trevor BrownandClaude Fable 5.1 3014737225 Magnetic Lasso: tests for following the visible composite (#11686)
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 15:49:58 -05:00
yoriswind cfda1d893b Merge current main into the five Classic Actions commands 2026-11-06 12:40:03 -08:00
yoriswind 9d9bf1e3a2 Fix Move Auto-Select toggling and locked-layer clicks 2026-11-06 12:19:26 -08:00