Commit Graph
3891 Commits
Author SHA1 Message Date
aiongg a78414a720 Merge #7412: Print: list printers and spool from one thread at a time 2026-10-27 17:44:09 +00:00
aiongg 6e9fb30dbc Merge #6723: Color Lookup: PSD save keeps a .3dl/.look LUT file as loaded (#6544) 2026-10-27 17:44:05 +00:00
aiongg 01594f1f25 Merge #5890: PSD: Frame layers keep their stroke (#4381) 2026-10-27 17:44:01 +00:00
aiongg 0662885964 Merge #5789: Channels: CMYK channels duplicate, load, split and merge as tone, not ink (#5787) 2026-10-27 17:43:58 +00:00
RickiNanoandClaude Opus 5.5 5558e4a2d0 Merge main into prefs/gpu-adapter-typed-read
Main split crates/engine/src/prefs.rs into prefs/ and moved the
gpu_startup tests to gpu_startup/tests.rs: read_section now sits beside
read_lenient in prefs/store.rs, and the malformed-sibling assertions
moved with the tests. Doc status lines and revision rows keep both sides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 18:32:23 +01:00
David MannandClaude Opus 5.5 3b964c0cdf Integration: video footage off the active artboard stays out of it; one depth check for copied layers (#4329)
CodeRabbit on #9775: newVideoLayerFromFile placed the layer while its content was still empty, so an active artboard always took it and clipped footage centred elsewhere; the first frame is now the content before placement, as in frames_to_layers (footage_off_the_active_artboard_stays_out_of_it fails without it). The merge also left a second check_group_depth ("Duplicate Layers") before main's "Copy Layers" one in layer.copyToDocument, so main's message could never show; it is removed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 18:18:48 +01:00
David MannandClaude Opus 5.5 425b5efeed Integration: a painted fill reserves its buffers before it builds them (#3779)
CodeRabbit on #9775: paint.stroke with fill:true builds the coverage, its feathered copy, the selection read and the mask over the region, up to the whole canvas (file.new allows 300000 x 300000), with infallible allocations that abort the process when memory runs out. The peak is now reserved through the fallible allocator first, and the selection is read through it; fill_survives_allocation_failure fails without this (the error came from a later blend).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 18:18:48 +01:00
GyoJoong Kum 916f6b4f49 Merge upstream main and adapt color persistence to module split 2026-10-27 17:10:10 +00:00
David Mann b731cdf9eb Merge PR #4329: Layers: New Group dialog and modifiers; new layers go into an open group and join its clip group
# Conflicts:
#	docs/ui-parity.md
2026-10-27 16:14:37 +01:00
bb88098343 Integration: new layers go into locked open groups; Stamp Visible above an open group (#4329)
A new layer with an open group active went above the group whenever the
group had any lock (all, pixels, transparency or position). The
reference application puts it inside, on top of the group's layers, even
when the group is locked with Lock All. Locks no longer keep New Layer,
New Group, adjustment and fill layers out. Layers that are edited right
after they are made (Type, Shape, Place's transform box, Paste, the
Gradient tool's live gradient, video layers, Render, Vanishing Point, a
new frame) take Place::AutoEditable and keep the PR's rule: they go
above a locked group, as before.

Stamp Visible with an open group active put the stamp inside the group,
where the group's opacity, mode or mask applied to the composite a
second time. The reference application puts it directly above the
group; with a layer inside the group active it still lands above that
layer, inside the group.

Co-authored-by: SckraT <70698629+SckraT@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 16:03:49 +01:00
David Mann 33e3fa2f8e Merge PR #6526: Font menu: favourites, recent fonts, class and similar-font filters, live preview 2026-10-27 15:53:56 +01:00
Khawar Zamman Wani 37c21e1d77 fix(transform): preserve action targets and clipped previews 2026-10-27 20:09:03 +05:30
David MannandClaude Opus 5.5 6fcbedd229 Merge origin/main into pr-4329-fixup
Main moved the engine commands into crates/engine/src/cmd/ and the
dialogs and panels into submodules. The PR's placement calls follow
them, and main's new insert sites (new_adjustment in adjust_params.rs,
Place in file_cmds/open.rs, shapes in vector_cmds/shape.rs) use
layer_place::insert_new like the PR's originals. The New Group dialog
moves to dialogs/new_group_ui.rs; the Layers panel flyout's New Group…
opens it.

Main's Session::precheck now also checks layer.new.group's and
layer.new.groupFromLayers' new params (name, color, mode, opacity,
position), so precheck_agrees_with_execute holds. Main had since added
"New Group…" to every catalog: the PR's duplicate rows are dropped.
Main's newer tests that made a layer with an open group active now
open the group last, as the PR did for the older ones.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 15:22:03 +01:00
David Mann 9324f7e823 Merge PR #9262: feat: Artboard from Layers takes a size of your own (#9087)
# Conflicts:
#	crates/engine/src/cmd/artboard_cmds/tests.rs
#	crates/ui-egui/src/filter_dialog.rs
2026-10-27 14:59:48 +01:00
e3b2854838 Integration: font menu fix-ups after merging main (#6526)
- Character section: a style picked under a family's ">" with type layers
  selected set the layers but not the style for new type (the options bar
  did both). Pick "Inter > Thin" in Properties > Character: new type stayed
  Regular.
- Faux bold: a pointed tip moved r/sin(half its angle) along its bisector,
  uncapped (3.9 r at 30 degrees, an A apex grew a spike), and tips sharper
  than about 20 degrees did not move at all. Every tip now moves at most
  2r, continuously; inner corners (the crotch of a V) keep their exact
  miter.
- Faux bold: each point searched past runs of coincident points for its
  neighbours, O(n^2); a contour of 50 000 copies of one point took ~8 s per
  glyph. Neighbours now come from one O(n) pass over the runs.
- prefs.reset {"path":"type"} and Preferences > Type > Reset Section wiped
  the favourite fonts; they are kept now (type.favoriteFonts by name, or
  Reset All, still clear them).
- An expanded family whose own row scrolled out of view lost its style
  rows, so the list below jumped up.
- Show Similar Fonts re-sorted around each font an arrow step applied, so
  Down went back and forth between two fonts; the list now compares with
  the font current when the filter was turned on (or the menu opened).
- Docs: an uninstalled favourite is kept but not listed; FAUX_BOLD_RADIUS
  and the raster budget describe the thickened outline; the unused
  "Recent font list" rows are gone; docs/scorecard.md regenerated (the
  favourite fonts are one more setting).

Co-authored-by: D-monized <341904702+D-monized@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 14:52:20 +01:00
9462fa130c Integration: Artboard from Layers dialog opens at the layers' size; refuse -0.4 (#9262)
The dialog remembered the last Width/Height: make a 1080x1350 board from one
layer, then open it for a 20x30 layer and press OK, and that layer got a
1080x1350 board too. It also opened at 0 and an empty Name. It now starts at
the selected layers' size and the next "Artboard N" every time, as in the
reference application. `{"height": -0.4}` rounded to 0 and kept the bounds;
negative sizes are now refused before rounding.

Co-authored-by: DuBearte <130190089+DuBearte@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 14:49:25 +01:00
Federico Olivares e173a9be17 Merge main into the integration batch
Main reorganised the source tree (command modules under engine/src/cmd, tools and dialogs under ui-egui/src, large files split into modules, inline test modules moved to their own files). This branch's changes to the moved and split files are ported to their new locations.
2026-10-27 10:44:16 -03:00
David Mann e0d06d3fc4 Merge PR #3779: paint.stroke: fill: true fills the enclosed region (#3659) 2026-10-27 14:42:54 +01:00
5a6473113e Integration: paint.stroke fill keeps picked CMYK inks and pads to the feather's reach (#3779)
fill_region called fill_cmds::blend_color_mask without the picked-inks
parameter main added, so the PR no longer compiled; it now passes the
brush's picked CMYK inks, as Edit > Fill and Edit > Stroke do, so a
colour picked as CMYK 100/0/0/0 fills a CMYK document with those inks
(where it covers fully; partial coverage blends through RGB, as there).

The soft fill's working bounds were padded by ceil(sigma)+2, but the
feather reaches ceil(3 sigma): a 40 px square filled with size 40,
hardness 0 ended in a hard step from ~0.1 to 0 at 1 sigma + 2 px. The pad
now comes from selection::feather_reach.

Tests through paint.stroke: fill_soft_edge_has_no_step,
fill_paints_a_cmyk_pick_with_the_picked_inks,
fill_works_on_cmyk_and_16_and_32_bit.

Co-authored-by: scott <1591011+dottedt@users.noreply.github.com>
Co-authored-by: echelon <39263+echelon@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 14:40:45 +01:00
David Mann 19d0be04b1 Merge branch 'main' into pr-3779-fixup
# Conflicts:
#	crates/engine/src/cmd.rs
2026-10-27 14:27:41 +01:00
David Mann 3a689f217c Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/file_cmds.rs
#	crates/engine/src/retouch_cmds.rs
#	crates/engine/src/vector_cmds.rs
#	crates/io/src/psd_export.rs
#	crates/io/src/psd_import.rs
#	crates/io/src/smart_map.rs
#	crates/psd/src/layer.rs
#	crates/raster/src/lib.rs
#	crates/ui-egui/src/camera_raw_ui.rs
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/filter_dialog.rs
#	crates/ui-egui/src/gpu_canvas.rs
#	crates/ui-egui/src/panels.rs
#	crates/ui-egui/src/retouch_ui.rs
#	crates/ui-egui/src/transform_tool.rs
#	crates/ui-egui/src/vector_ui.rs
#	docs/gaps.md
2026-10-27 14:26:26 +01:00
David Mann 7567bf56d4 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/edit_menu_cmds.rs
#	crates/ui-egui/src/transform_tool.rs
2026-10-27 14:25:22 +01:00
David Mann 55a0ba21d9 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/atn_cmds.rs
2026-10-27 14:24:33 +01:00
David Mann fc81603899 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/layer_multi_cmds.rs
2026-10-27 14:23:16 +01:00
cefd60d10f Integration: drop the selection after a shared transform; don't snap to its layers (#8623)
With several layers selected and a marquee active, Free Transform in the
reference application moves the whole layers and drops the selection.
`edit.transform {"layers"}` moved the layers but left the marching ants
where they were. It now clears the selection in the same edit, so one undo
restores both. The live preview keeps showing the selection.

Snapping a shared box excluded only the active layer, so the box snapped
to the original edges of the other selected layers, which move with it.
Its edge starts on theirs, so a 2 px drag snapped straight back. It now
excludes every layer of the shared session.

Co-authored-by: eiketre <71788463+ekedal@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 14:22:59 +01:00
David Mann c2609adbb5 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/type_cmds.rs
#	crates/engine/src/lib.rs
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/panels.rs
2026-10-27 14:22:33 +01:00
David Mann 93036e6b68 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/prefs.rs
#	crates/ui-egui/src/dialogs/sizing.rs
#	crates/ui-egui/src/prefs_ui.rs
#	docs/gaps.md
2026-10-27 14:21:35 +01:00
midasdf 4289feaf16 Merge origin/main into jp/print-paper-sizes
main split crates/ui-egui/src/file_ui.rs into dialogs/file_ui/ and deleted
the old file, and moved the engine's print module under cmd/. The print
dialog's paper work goes to dialogs/file_ui/print.rs: print_paper_label for
the Japanese presets, paper_size() for alias-aware lookup, and the canonical
key shown when file.print remembered an alias. The engine change (PAPERS
with the Japanese sizes, PAPER_ALIASES, paper_size) merged into
crates/engine/src/cmd/print_cmds.rs unchanged.
2026-10-27 22:20:59 +09:00
David Mann b58449985f Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/cmd/type_cmds.rs
#	crates/engine/src/edit_cmds.rs
#	crates/engine/src/layer_multi_cmds.rs
#	crates/engine/src/lib.rs
#	crates/ops/src/lib.rs
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/menus.rs
#	crates/ui-egui/src/move_mods.rs
#	crates/ui-egui/src/panels.rs
#	crates/ui-egui/src/transform_tool.rs
2026-10-27 14:20:51 +01:00
David Mann 854cea1e12 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/web_cmds.rs
#	crates/ui-egui/src/prefs_ui.rs
2026-10-27 14:19:38 +01:00
David Mann 3e15ea9eb9 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/compose/src/adjust.rs
#	crates/gpu/src/plan.rs
#	crates/io/src/adjust_map.rs
2026-10-27 14:19:34 +01:00
David Mann 40b1318bd3 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/image_cmds.rs
2026-10-27 14:18:35 +01:00
David Mann a95536f711 Merge remote-tracking branch 'origin/main' into fix/xml-nesting-cap 2026-10-27 14:17:47 +01:00
David Mann a76c735f06 Merge remote-tracking branch 'origin/main' into fix/system-tools-full-path 2026-10-27 14:17:40 +01:00
David Mann f2d4ab5683 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/image_cmds.rs
2026-10-27 14:17:39 +01:00
David Mann b519d300ea Merge remote-tracking branch 'origin/main' into fix/svg-markup-check 2026-10-27 14:17:27 +01:00
David Mann 2363c475c0 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/compose/src/lib.rs
#	crates/gpu/src/plan.rs
2026-10-27 14:17:25 +01:00
David Mann d3419e5c6c Merge remote-tracking branch 'origin/main' into fix/scale-effects-bevel-texture 2026-10-27 14:16:59 +01:00
David Mann 38a0f44ec6 Merge remote-tracking branch 'origin/main' into fix/remove-enable-animations 2026-10-27 14:16:50 +01:00
David Mann e7f810a406 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/channel_cmds.rs
#	crates/engine/src/edit_cmds.rs
2026-10-27 14:16:23 +01:00
David Mann 793b2942de Merge remote-tracking branch 'origin/main' into fix/image-size-resolution-range 2026-10-27 14:16:18 +01:00
David Mann 718636e55e Merge remote-tracking branch 'origin/main' into fix/history-options 2026-10-27 14:16:11 +01:00
David Mann e952e49f0c Merge remote-tracking branch 'origin/main' into fix/flip-angle-gradient-sweep 2026-10-27 14:16:03 +01:00
David Mann 6275e68020 Merge remote-tracking branch 'origin/main' into fix/crop-hidden-resample-budget 2026-10-27 14:15:17 +01:00
David Mann 89489082cc Merge PR #8923: fix(ui): Remove Tool trail tints all a stroke removes; brush trails follow hardness (#8916) 2026-10-27 14:01:28 +01:00
David Mann c14a707d2a Merge PR #6583: PSD/PSB open without reading the whole file: channel data read as decoded, in bands into tiles (#5106)
Merged at the fix-up commit before its main merge (362947695d); the
conflicts with the batch are resolved here: psd_import.rs keeps both
sides' tests, tiff_layers.rs takes ImageData::new.
2026-10-27 13:50:37 +01:00
041aac9ecb Integration: folder batches skip raws that open only as the preview (#9097)
Listing every photocraft_raw extension also picked up CR3, ORF, RAF, RW2,
SRF and SR2. The raw decoder can't read CR3, compressed ORF and RAF, or RW2
raw formats other than 3, 4 and 5 yet; import then falls back to the
embedded JPEG preview with only a warning, so a folder batch would process
the thumbnail silently. The folder list now takes the raws whose usual files
decode (DNG, CR2, NEF, NRW, ARW, PEF), and the test pins both sides.

Port of the reviewed fix-up 202ce9c2a (davidmann4/photocraft pr-9097-fixup)
to this batch's file layout: same changed lines, in file_cmds.rs instead of
main's later file_cmds/paths.rs split.

Co-authored-by: .CooCoo <1206598+dotCooCoo@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 13:28:27 +01:00
David Mann f35e2307de Merge PR #9097: Batch: folder sources take every format PhotoCraft opens 2026-10-27 13:27:35 +01:00
David Mann f811db8f65 Merge PR #9321: feat: type on a path follows its path when the path is edited (#9114) 2026-10-27 13:12:53 +01:00
jonathanwxh-cell f97eb2849a Merge upstream main and resolve custom shape import conflicts
Preserve CSH import behavior, inline-data authorization policy, localization and regression tests while retaining upstream module extraction.

Local verification: formatting and independent static review passed. Parser/engine/automation/UI runtime, broader Clippy, WASM and visual gates remain incomplete locally because of resource limits. Hosted CI must establish remaining gates; this commit does not claim the PR is ready to merge.
2026-10-27 19:47:58 +08:00