Commit Graph
2574 Commits
Author SHA1 Message Date
jonathnwxh 7b4f2b2670 Remove obsolete ATN format gap while retaining contour preset gap 2026-10-19 04:46:30 +08:00
Finn Newick d65d48b6e0 Merge remote-tracking branch 'origin/main' into perf/doc-shared-blobs 2026-10-18 21:45:49 +01:00
Finn Newick 6350be812f Merge remote-tracking branch 'origin/main' into fix/tiff-alpha-compression
# Conflicts:
#	docs/gaps.md
2026-10-18 21:41:19 +01:00
Finn Newick 5c665ca96f Merge remote-tracking branch 'origin/main' into fix/tiff-alpha-compression
# Conflicts:
#	crates/engine/src/file_cmds.rs
2026-10-18 21:23:58 +01:00
Finn Newick 1e8dcb53b9 Merge remote-tracking branch 'origin/main' into fix/bundle-save-lock 2026-10-18 21:21:28 +01:00
Finn Newick d8053570c7 Merge remote-tracking branch 'origin/main' into perf/doc-shared-blobs 2026-10-18 21:21:26 +01:00
denstu473 2eeed94e51 test(atn): add native parser matrix and contract fixtures 2026-10-18 21:58:06 +02:00
David MannandClaude Opus 5.5 37a4491c63 Merge main into perf/p25-blur-cancel
Conflict in crates/engine/src/filters.rs: main made keep_alpha pub(crate) for the
plug-in runner (#6770); kept the PR's parallel, cancellable keep_alpha with that
visibility, and the plug-in caller now passes a never-cancelled check and propagates
the Result.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:57:28 +02:00
00xJ0 73123e621a GPU fallback: Retry GPU after an error rebuilds the GPU canvas now, no restart (#6577)
After an error on a device that still works (out of memory, validation), Retry GPU builds a new GPU canvas on the same render state with a fresh health flag, and the views go back to the GPU. After a loss or a failed GPU start it still schedules the retry for the next launch. The dialog says which. Two new strings, translated in all 20 catalogs.
2026-10-18 12:53:50 -07:00
00xJ0 4615a8bc26 Survive a lost window GPU device: draw nothing, save unsaved work for recovery, close (#3438, #1215)
When the window's own wgpu device was lost (a driver reset, e.g. after sleep), egui-wgpu could
not draw another frame: a frame with shapes panicked inside it ("Failed to create staging buffer
for index data", #1215, exit 101, unsaved work lost), and a frozen window's close button opened
an unsaved-changes prompt nobody could see (#3438). The #243 fallback only covered the canvas.

- DeviceHealth::device_lost (wgpu reported the loss, not a recorded fault) and ::probe (a
  non-blocking poll that keeps running after a recorded fault).
- RecoveryStore::flush: finish queued autosaves and wait for them.
- gpu_status::check_window, at the end of every frame: once the window's device is lost the
  frame draws nothing; the first time every unsaved document is written to crash recovery
  (Services::flush_autosaves) and the app closes without asking. The next launch reopens them.
- The app watches the window device on the CPU canvas too; ui.gpu.simulateLoss {destroy: true}
  destroys the real device to drive the path.

Verified on an RX 6900 XT, Vulkan and DX12: destroying the device in the running app exited 101
with the egui-wgpu panic before, and now exits 0 with the document recovered on the next launch.
2026-10-18 12:53:48 -07:00
PanPDX b2f18f7e4e Merge remote-tracking branch 'upstream/main' into area-type 2026-10-18 12:47:22 -07:00
David MannandClaude Opus 5.5 0aaabb11f9 Merge main into feat/auto-219-8-panel-command-check
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:44:43 +02:00
David MannandClaude Opus 5.5 42877b18e4 Merge main into docs/scorecard-stale-rows-2
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:39:36 +02:00
Khawar Zamman WaniandClaude Opus 5.5 4e5f4ca617 Marching ants in device pixels, like Photoshop's (#7489)
The ants were snapped to the middle of an egui point and drawn one point
wide without antialiasing. At a fractional display scale (125 %, 150 %) a
point is not a whole number of pixels, so one edge of a selection came out
2 px thick and the next 1 px, and dashes were 5 px here and 4 px there.

New ants.rs draws every ants outline (committed selection, marquee/lasso/
zoom/move-box drag previews, Free Transform, Content-Aware Move) in device
pixels: every edge ceil(ppp) px thick, dashes and gaps 4x the thickness,
a screen-fixed pattern whose rows shift against each other so dash ends
slant as in Photoshop, and an unchanged march speed. Straight edges are
pixel-aligned mesh quads cut to the view; slanted edges stay antialiased
line shapes at the same thickness.

Tests: ants::tests (unit), tests/marching_ants_pixels.rs (GPU render at
1/1.25/1.5/2x; on the old code it fails with top 1 px, right 2 px).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 00:11:41 +05:30
dotCooCoo 77e20dad31 Merge main into fix/save-added-extension-asks-before-replacing 2026-10-18 08:52:16 -07:00
abc2cbandClaude Opus 5.5 2a81d271b5 Merge upstream/main 4df773e9 into codex/github-smart-filters-usability-20261011
Conflicts and how they were resolved:
- crates/ui-egui/src/canvas.rs (ensure_filter_preview): kept our edit_command(), which
  also covers the Blending Options dialog and checks the target guard; main's
  smart_ui::confirm_command(fields, cmd, params) form (#6324) is the same preview
  (setParams on the proxy) without the guard.
- crates/ui-egui/src/filter_dialog.rs (preview_document_for_target): kept our scaling
  of the smart filters' lengths and the mask feather on the proxy (proxy_document
  already scales cache, placement and mask, so nothing is scaled twice); dropped
  main's run-at-full-size branch for setParams and its now unused
  SMART_FILTER_SET_PARAMS constant.
- crates/ui-egui/src/smart_ui.rs (open_editor): kept our open_editor (target guard,
  adjust_dialog then filter_dialog with reset_fields, then __smartFilter and the
  stored params) over main's edit_filter helper; adjustment edits keep their live
  preview (adjust_preview skips the layer path for __smartFilter), so main's
  __preview removal for __adjust is not needed.

Adapted to main's API: smart_ui::preview_command (main, #6324) now also returns the
Blending Options command for our blending dialog, so the preview window matches its
key.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 18:52:02 +03:00
UnemarsandClaude Fable 5.1 e4e0a789cc Camera Raw: choose the demosaic method when a raw opens
A camera raw always opened with AHD demosaicing; `photocraft-raw` has three methods but neither the open-time Camera Raw dialog nor Preferences offered them.

- Preferences › Camera Raw › Demosaic (`rawDefaults.demosaic`: ahd, mhc, bilinear; default ahd): raws open with it.
- The open-time dialog's Detail panel gets a Demosaic row that starts from the preference; Open re-develops when the choice differs from the method the file was opened with (`RawOpen::developed_with` / `demosaic`, `RawTuning::demosaic`), as it does for the raw-stage sliders. The preview keeps the method the file was opened with. Control channel: `ui.demosaic`, `openingRaw.demosaic`.
- Imports take `photocraft_io::ImportOptions` (SVG group depth and demosaic) instead of the depth alone: `import_with_options`, `import_with_options_and_interrupt`, `jobs::import_options(prefs)`, `ImportFn` takes `&ImportOptions`; desktop, web, background opens and Place pass the user's settings.
- The eight new strings in all 20 catalogs; the scorecard counts the new preference.

Test: `camera_raw_ui::tests::the_demosaic_method_is_chosen_at_open` (another method re-develops with different pixels; the preference develops the open itself and Open then changes nothing; unknown methods and the choice outside a raw open are refused); `prefs_ui` shows the setting.

Split out of #3816 at the reviewer's request.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-10-18 16:24:46 +02:00
aiongg e7d4ce5e18 Merge PR #6364: Path Selection: the canvas right-click opens the path menu, as the Pen's does (#1056) 2026-10-18 14:19:00 +00:00
Michael Higgins f45d15d211 Merge branch 'main' into fix/688-windows-symbols 2026-10-18 10:15:51 -04:00
Michael Higgins 27260461e1 Merge branch 'main' into fix/iris-xe-texel-guard 2026-10-18 10:15:37 -04:00
dotCooCoo 44d3944efa Merge main into fix/save-added-extension-asks-before-replacing 2026-10-18 07:10:35 -07:00
abc2cb 710c26af41 Merge remote-tracking branch 'upstream/main' into codex/github-smart-filters-usability-20261011
# Conflicts:
#	crates/ui-egui/src/i18n/de.tsv
#	crates/ui-egui/src/i18n/el.tsv
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/fr.tsv
#	crates/ui-egui/src/i18n/id.tsv
#	crates/ui-egui/src/i18n/it.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/nl.tsv
#	crates/ui-egui/src/i18n/pl.tsv
#	crates/ui-egui/src/i18n/pt-br.tsv
#	crates/ui-egui/src/i18n/ru.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
2026-10-18 17:03:06 +03:00
abc2cb 978410ea66 Merge remote-tracking branch 'upstream/main' into feat/psd-distort-invert-smart-filters 2026-10-18 17:02:23 +03:00
oRE-o 98b9298d10 Clarify Gradient Overlay source loss when saving styles 2026-10-18 21:13:58 +09:00
oRE-o 7cd48cbaa3 Document the Gradient Overlay Method control with offscreen captures 2026-10-18 20:26:18 +09:00
Ratul Paul 7ccac6d430 Merge upstream main and resolve contributor entry conflict
Keep main’s new 1Git2Clone and Silvertree2010 contributor entries and
append the original WebWork-rrs display-name entry. Preserve the UI scale
presets, translations, documentation and tests from PR #3316.
2026-10-18 16:46:14 +06:00
oRE-o 8fb5d94d2b Gradient Overlay: expose interpolation methods and retain source stops 2026-10-18 18:36:30 +09:00
Matthias Schlich 690a73b595 Merge origin/main into feat/psd-render-smart-filters 2026-10-18 11:14:58 +02:00
Khawar Zamman Wani 3a5e7cf0b0 Merge origin/main into feat/6000-color-panel-modes 2026-10-18 14:39:02 +05:30
Khawar Zamman Wani 1004c19253 Merge origin/main into save-for-web-webp 2026-10-18 14:27:55 +05:30
Khawar Zamman Wani 5a68ee5d54 Merge origin/main into hand-tool-modifier-zoom 2026-10-18 14:27:55 +05:30
Khawar Zamman Wani a014cd0023 Merge origin/main into fix/6501-multi-layer-free-transform 2026-10-18 14:27:54 +05:30
Khawar Zamman Wani 12ccac5543 Merge origin/main into field-wheel-5473 2026-10-18 14:27:54 +05:30
PanPDX 52fb67edde Merge upstream/main into area-type 2026-10-18 00:47:41 -07:00
wwew 04967b12f9 docs: write product name as PhotoCraft in engine module doc, LUT export header and image sources (#5454) 2026-10-18 03:35:28 -04:00
PanPDXandClaude Opus 5.5 6ed536ce34 Merge upstream/main into area-type
Conflicts: upstream's horizontal-scale line breaking (#5565) touched the
same break and alignment code as area type. Box text keeps breaking at
the scaled width; area rows break at their span widths as before, with
the scale fixed at 1, since area spans are already in layout space.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V5GRiHVR8XvTrbL1j8y9jW
2026-10-18 00:16:17 -07:00
jonathnwxh 19d87616c5 Merge upstream while preserving both Serbian translation additions 2026-10-18 14:57:35 +08:00
Davit MatchakhelidzeandClaude Opus 5.5 e40413bed9 Merge main; Georgian rows for the strings added upstream
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YMTAbGNRxnMEzRvYnQGphF
2026-10-18 08:31:58 +04:00
haranishi dd21e325b5 fix(appimage): expose the bundled CLI and MCP entry point 2026-10-18 10:55:00 +09:00
Jeremy YaoandClaude Opus 5.5 0bdac25172 Merge branch 'main' into feature/animation-effects
Brings in 20 commits from main. Two conflicts, both in dependency lists:
- apps/photocraft-web/Cargo.toml: main added the web-sys DomRect feature; the
  list is main's plus this branch's MediaQueryList.
- Cargo.lock: main's, with cargo adding back this branch's one line (the
  desktop app's direct windows dependency).

docs/scorecard.md is regenerated; it differs from main only in UI-217-10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-17 21:47:37 -04:00
Vikram Bhaskaran c87af035b7 Merge origin/main into feat/iff-read 2026-10-18 11:56:31 +11:00
Vikram Bhaskaran 4a2a73c226 Merge origin/main into feat/dicom-read 2026-10-18 11:55:26 +11:00
Korg1ch 7e5a97385e fix(ui): right-click an Adaptive Wide Angle constraint for its orientation menu, as in Photoshop 2026-10-18 03:00:09 +03:00
dotCooCoo c2cf0e0610 Merge main into fix/mixer-brush-clean-and-load 2026-10-17 16:28:35 -07:00
dotCooCoo 8af2ffef6e Merge main into fix/save-added-extension-asks-before-replacing 2026-10-17 16:28:33 -07:00
Stepan Pavlenko e4bc5c25e8 i18n(ru): translate the dynamic labels the Russian catalog was missing
The Russian catalog passed `cargo xtask i18n-coverage` (100% of measured keys)
but lacked the runtime-only labels the other catalogs already carry, so they
showed in English: filter and adjustment parameter names and choices, gallery
names, Camera Raw panels (Balance/Clarity/Dehaze/Color Mixer/Texture/…),
History/Layers/paths/channels menu labels, metadata and File Info fields,
System Info and hardware status lines, rasterize prompts, composed status
templates and dialog text.

All of them are translated (1,229 keys added; the catalog is now 4,227 keys
against upstream's 2,998), written from the meaning of the English labels and
reusing the vocabulary the catalog already uses (Highlights → Света,
Midtones → Полутона, Feather → Растушёвка, Pattern → узор). Filter and gallery
names are aligned with the menu labels already in the catalog so a filter never
reads two ways (Texturizer → Текстуризатор, Unsharp Mask → Нерезкое
маскирование, Shape Blur → Размытие по фигуре, …).

Tests: `russian_covers_generated_filter_options_and_gallery_names`
(filter_dialog.rs, the Italian/Korean/Spanish check) and
`russian_dynamic_status_hardware_and_dialog_labels_are_translated` (i18n/mod.rs).
Docs: docs/localization-ru.md (terminology), localization-parity, gaps G13,
ROADMAP, ATTRIBUTION and LICENSE-translations.

Validated on a rebase onto upstream/main: `cargo test -p photocraft-ui-egui
--lib` 2,998 passed / 0 failed; clippy clean (the only lint is a pre-existing
`nonminimal_bool` in canvas.rs, untouched here and present on upstream main);
`xtask layers` OK; `xtask wasm` OK; `xtask i18n-coverage` ru 1,863 / 1,863;
offscreen `snapshot` in Russian checked.
2026-10-18 02:27:44 +03:00
dotCooCoo 3c9c93ed8c GPU startup: Auto on Windows leaves Vulkan out when an Intel adapter is present (#4)
With the `auto` backend on Windows, eframe created its wgpu instance with
Vulkan, and creating it, listing its adapters and asking each adapter
about the window's surface loaded and ran the Intel Vulkan driver
(igvk64.dll) before the adapter selector could pick Intel's DX12
adapter. When the driver crashed there, the first launch died, and only
the next one moved to DX12 through the startup marker.

`configure` now lists the DX12 adapters first, with a DX12-only
instance, when the plan is `auto` on Windows without WGPU_BACKEND. If
one of them is an Intel adapter, the instance is created with DX12 and
GL only (GL stays the last resort), so no Vulkan driver is loaded. On a
system with an Intel and a discrete GPU, the discrete GPU then runs on
DX12 instead of Vulkan. WGPU_BACKEND, --safe-gpu, a chosen backend and
the crash fallback are unchanged, and System Info still shows the Intel
DirectX 12 note.

The decision is `windows_auto_backends`, tested with vendor lists.
2026-10-17 15:28:20 -07:00
Theo Wilenius 6ebfd87a0d Merge branch 'main' into fix/6286-guide-drop-on-either-ruler 2026-10-18 00:59:29 +03:00
Diego Chagas 235e7578f3 Print through CUPS over IPP and the print portal, so File › Print works in the Flatpak (#2728) (#3017)
Main prints through craft-print, which runs `lp`; a Flatpak has no `lp`,
so File › Print fails there. This keeps craft-print as the route wherever
`lp` is on the path (and on Windows) and adds two more behind it:

- `photocraft-ipp`, a pure-Rust IPP client (CUPS-Get-Printers/Classes/
  Default, Print-Job over HTTP/1.1) that talks to CUPS over its socket or
  TCP; the Flatpak manifests grant --socket=cups for it. A `printServer`
  named in the request always takes this route. `file.print.printers`
  lists the queues.
- The XDG Print portal as the app's spooler (`Session::print_spooler`),
  for a sandbox without the CUPS socket or a system without a printer:
  the system print dialog, seeded with copies, paper and orientation.
  PHOTOCRAFT_PRINT_PORTAL=1 prefers it, =0 removes it.

A route that exists but fails (unknown printer, refused job) is an error;
only a missing route moves on. Results gain `backend` (lp, windows, ipp,
portal). docs/printing.md describes the routes.
2026-10-17 15:55:54 -06:00
deniskhudandClaude Opus 5.5 89305c1d17 Shape tools: gradient Fill and Stroke from the swatches, with an editable stops strip
The shape Fill / Stroke swatches (options bar and Properties) offer No Color, Solid and
Gradient, as Photoshop's popover does, for the next shape and the selected one. The
Gradient tab (shape_gradient_ui.rs) has a Recent row, the preset library, a stops strip
(click to add a colour or opacity stop, drag to move, drag off to delete, midpoints) with
the selected stop's colour, opacity, location and Delete, and style, angle, scale,
Reverse and Align with layer. Stop edits reuse the Gradient Editor's apply_stop.

shape.create / shape.edit take and report every gradient field (opacityStops,
midpoints, offset, dither, align), so editing an imported gradient keeps the rest.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-17 23:13:04 +02:00