Commit Graph
2616 Commits
Author SHA1 Message Date
FredApps cb1c76e6cf Merge approved PhotoCraft PR #5939: fix(paint): scale blur sigma with brush size (#5892)
Port unchanged PR hunks to their unique current module locations after upstream file splits.
2026-10-29 03:36:14 +01:00
FredApps cd6c4464b0 Merge approved PhotoCraft PR #9594: fix(engine): copied type keeps its size across resolutions after an edit 2026-10-29 03:30:01 +01:00
FredApps e8692b87a4 Merge approved PhotoCraft PR #9418: Color Lookup: honour the .3dl Mesh header's cube edge and output depth (#9078, #9073) 2026-10-29 03:29:52 +01:00
FredApps a074b07b4b Merge approved PhotoCraft PR #9172: Gradient Fill layer: default to Foreground to Transparent (#8708) 2026-10-29 03:29:48 +01:00
FredApps ce77d3def1 Merge approved PhotoCraft PR #8931: feat(algo): describe the Gaussian blur as data for other devices 2026-10-29 03:29:42 +01:00
FredApps 86fcbf26ee Merge approved PhotoCraft PR #7648: Pen: Path Operations menu, as in Photoshop (#1397) 2026-10-29 03:29:31 +01:00
FredApps 71e49e861a Merge approved PhotoCraft PR #6387: Video Frames to Layers: every page of a multi-page TIFF (part of #6379) 2026-10-29 03:29:23 +01:00
FredApps b426bd284b Merge approved PhotoCraft PR #4742: fix(macos): bundle photocraft-cli and resolve it from droplet scripts 2026-10-29 03:28:35 +01:00
Claude cd111a0339 Merge storytold/photocraft main into the Fill/Stroke popover branch
Clean merge of 16 upstream commits; scorecard unchanged (12 of 182).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
2026-10-29 01:10:22 +00:00
Vlad Grankovsky 94c1ddcb2f Merge origin/main into codex/multi-channel-editing
Integrate main 69b8fd9c1, retaining multi-channel selection and editing through extracted channel-panel, Move-pointer and tone-editor helpers. Adapt explicit imports and preserve progress-document histories.
2026-10-29 00:37:26 +01:00
Federico Olivares 50f4602c33 Merge main into the integration batch 2026-10-28 18:20:58 -03:00
Khawar Zamman Wani 64422e7ef1 Merge main into save-for-web-webp 2026-10-28 21:09:35 +05:30
Federico Olivares 5a6270921c Merge main into the integration batch
Main now carries #9031 (Halftone) and #8923; this branch keeps only what it adds on top: the guard for a setting beside a Gallery stack's effect list, its test, and the PSD open warning for patterns that paint nothing.
2026-10-28 11:17:59 -03:00
Claude 30abc52781 Merge storytold/photocraft main into the Fill/Stroke popover branch
Upstream's strict-Clippy refactor removed glob imports and split the
Content-Aware Fill properties into caf_props_panel: the swatch title moved
there, and the frame loop calls crate::color_picker_ui::widget_tick.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
2026-10-28 07:55:52 +00:00
Brennan StehlingandClaude Opus 5.5 c855685c7f test: cover group and clip-base effect damage, and mask undo coverage (#9329)
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 23:09:58 -07:00
Brennan StehlingandClaude Opus 5.5 2119158a5e perf: a pixel change damages only the tiles that changed; command rects become checked hints (#9329)
step_damage narrows a layer whose only change is in its surfaces (pixels, mask, type,
smart-object and fill caches) to the bounding box of the tiles that differ: a merge walk of
the two tile maps, pointer compares only. A mask's tiles grow by its feather, all of them by
the layer's effects and the effects of the groups around it, never past the layer's whole
extents. A frame-spanning effect whose frame moved keeps the whole extents (#4053). Undo,
redo and History jumps get it for free: undoing a 60 px dab on a full-canvas layer redraws
its tiles, not the canvas, and so does a fill or filter on a small selection.

The painting commands' own damage rects go through one door, Session::hint_damage, which
intersects them with the edit's damage. Debug and test builds count a hint that misses a
changed tile in Session::damage_misses and log it; nothing panics. refresh_type_layers reports
step_damage instead of None.

Deleted: note_damage and layers_damage (identical to step_damage after layer.setProps and
layer.translate), note_inert_insert (step_damage already steps over inert layers, #1771),
and the engine's siblings_of they used.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 23:09:58 -07:00
aiongg 2b1c6b93c3 Merge main into split-filter-adjust-crop-fx-builders
crop_ui.rs moved to tools/; the PR's builders replace main's Clippy extractions of the same code; #6723's Color Lookup save carried into the moved encoder.
2026-10-28 04:22:40 +00:00
Khawar Zamman Wani 8b835a103c Merge origin/main into pen-path-operations 2026-10-28 09:22:55 +05:30
Khawar Zamman Wani e729ead4b2 Merge origin/main into fix/6501-multi-layer-free-transform 2026-10-28 09:22:55 +05:30
Khawar Zamman Wani eccc20d1b2 Merge origin/main into perf/cropped-selection-blurs 2026-10-28 09:22:52 +05:30
Khawar Zamman Wani 5f03f1424b perf(paint): skip dry mixer canvas sampling 2026-10-28 08:09:49 +05:30
Dylan M. Taylor af45d71447 Refactor engine for strict Clippy checks 2026-10-27 23:47:06 +00:00
Finn NewickandClaude Opus 5.5 d42dd4c630 Merge origin/main into feat/operator-separable
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 22:51:51 +00:00
Claude f84111c2d8 Merge storytold/photocraft main into the Fill/Stroke popover branch
i18n and ui-parity conflicts were append-only: upstream's entries first,
this branch's after. docs/scorecard.md regenerated (12 of 182).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
2026-10-27 21:13:57 +00:00
Claude 957e7d3347 Merge storytold/photocraft main into the Fill/Stroke popover branch
Upstream moved the touched modules (dialogs/, tools/, widgets/ split) and
added its own Gradient tab to the shape Fill/Stroke swatches. Resolved by
porting this branch's changes onto the new layout:

- widgets/color.rs: color_edit_button* open the full Color Picker dialog
  (tests in widgets/color_button_tests.rs).
- tools/paint_picker.rs (was paint_picker.rs): the popover reuses
  shape_paint_ui::PaintChange (plus OpenPicker) and upstream's
  shape_gradient_ui Gradient tab instead of its own gradient preset list,
  so gradients now also work for the next shape's defaults.
- shape_paint_ui::swatch draws the popover; shape_options and
  vector_ui/options handle OpenPicker and Recently Used Colors.
- adjust_editors, caf_ui, file_ui call sites and tests moved to their
  new files; i18n entries appended after upstream's.
- docs/scorecard.md regenerated (12 of 181 settings unread).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TYsCL5E2GM6hUabP9dmYAv
2026-10-27 21:04:03 +00:00
Vlad Grankovsky df76a8c22f Merge origin/main into codex/multi-channel-editing
Integrate main dacecbfea, retaining selected-colour and explicit clipboard targets alongside CMYK and spot-channel tone fixes. Cover explicit spot copying while multiple colour rows are selected.
2026-10-27 21:15:06 +01:00
David MannandClaude Opus 5.5 5ccb6fb723 Merge main
Conflicts with main's batch #9880:
- psd file.rs / layer.rs: #5287 (PSB by encoded size, RLE tables widened on
  promotion) against #6583's lazy reader. Main's new widening and length code
  read `.data`, which #6583 leaves empty while the bytes stay in the source;
  it now goes through `encoded()` / `encoded_len()` (also the auto-merged
  lines in `rle_widening`, `encoded_len` and `LayerRecord::write`), and the
  lazy reader sets `write_as_psb: false`. New test
  `a_lazy_psd_promotes_to_the_same_psb_as_an_eager_one`: a lazily read PSD
  writes the same PSB bytes as an eager one; it fails with a `.data` read.
- direct_select.rs / vector_ui.rs: #9321's Type Path and #6353's hidden
  Work Path both kept.
- io tests main.rs: both modules. scorecard.md regenerated (12 of 181);
  ui-parity.md and gaps.md follow it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 19:49:42 +01:00
aiongg 0e3a6f7e8d Merge #9421: XML: deeply nested ORA, KRA, Camera Raw XMP, .kys and layer XMP are an error, not a crash (#9419) 2026-10-27 17:44:23 +00:00
aiongg d01f2de508 Merge #9393: Preferences: the Generator checkbox reads Enable Generator, as in the reference application (#9392) 2026-10-27 17:44:16 +00:00
aiongg 2f6392574d Merge #9385: Actions: save and read the Lab Lightness channel as Lght (#9384) 2026-10-27 17:44:15 +00:00
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
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
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 55a0ba21d9 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/engine/src/atn_cmds.rs
2026-10-27 14:24:33 +01:00