Commit Graph
2574 Commits
Author SHA1 Message Date
GyoJoong Kum 916f6b4f49 Merge upstream main and adapt color persistence to module split 2026-10-27 17:10:10 +00:00
SvenCarstensen 95cba18ba5 Add before and after screenshots of guide unit selection 2026-10-27 17:44:07 +01:00
SvenCarstensen 04bcb7e302 Document selectable guide position units 2026-10-27 17:43:27 +01:00
saschaweissandClaude Opus 5.5 b49de17116 Merge upstream main into type-color-live-preview
Upstream split canvas.rs and lib.rs into modules and moved the dialogs
under dialogs/. The preview module moves with them
(dialogs/color_picker_preview.rs); its canvas hooks now sit in
canvas/display.rs and canvas/textures.rs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014QvfaMyAX4i4PbKBMnvFj6
2026-10-27 17:18:34 +01:00
Higgs32584andClaude Opus 5.5 54515f94b3 fix(ui-egui): the rasterize prompt no longer replays the click that opened it (#8806)
Pressing a pixel tool on a type, shape, Smart Object or fill layer opens the
"Rasterize?" prompt. On OK, confirm() ran layer.rasterize.* and then replayed
the stored press as ToolEvent::Down/Up, so the brush, eraser or bucket acted
on a click the user had made only to get past the dialog. Photoshop 2026
converts the layer and does nothing else; the next click paints.

confirm() now only rasterizes and returns {"rasterized"}. The prompt still
records the tool and point in its fields. The control-protocol doc and the
TOOL-213-5 scorecard row describe the new behaviour.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 11:50:31 -04: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
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
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
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
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 6f7acded9e Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/ui-egui/src/control.rs
2026-10-27 14:23:53 +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 dc45a83c88 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	crates/automation/src/rpc.rs
#	crates/automation/src/workspace.rs
2026-10-27 14:20:28 +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 718636e55e Merge remote-tracking branch 'origin/main' into fix/history-options 2026-10-27 14:16:11 +01:00
David Mann 64550db7c8 Merge remote-tracking branch 'origin/main' into feat/auto-219-8-panel-command-check 2026-10-27 14:13:58 +01:00
Jeremy 6599f6dbd2 docs(installer): say that silent installs are per-user and when the scope page appears 2026-10-27 12:26:56 +00:00
Jeremy e51f604ea4 docs(installer): note that the 32-bit all-users folder is Program Files (x86); tidy wording 2026-10-27 12:25:20 +00:00
Jeremy 94e13c9e6f docs(installer): describe the per-user default install location and scope 2026-10-27 12:09:03 +00:00
Jeremy bf4e8214fc fix(installer): correct the wizard and shortcut description in the release docs; harden install-policy checks 2026-10-27 12:01:33 +00:00
Jeremy 9956352be0 packaging(windows): dual-scope MSI, per-user by default, under the ArtCraft suite folder
Microsoft "Single Package Authoring": Package/Scope="perUserOrMachine"
writes ALLUSERS=2 and MSIINSTALLPERUSER=1, so the package installs
per-user by default (no UAC prompt) into %LOCALAPPDATA%\Programs\ArtCraftPhotoCraft (Windows Installer redirects the ProgramFiles folder in a
per-user install), and per-machine into Program Files\ArtCraft\PhotoCraft
through the setup wizard's "Install for all users" box or msiexec
ALLUSERS=1. Registry follows the context automatically: HKMU writes HKCU
per-user and HKLM per-machine, HKCR classes land in HKCU\Software\Classes
per-user, and components are keyed on registry values (ICE38).

Upgrades update the copy registered in the same context: the remembered
InstallDir is read from HKLM and HKCU separately, and installing in the
other context while a copy already exists is stopped with a message naming
the fix rather than creating a silent duplicate. The existing UpgradeCode,
ProductCode behaviour and per-machine upgrades are unchanged.

The Start Menu shortcut becomes non-advertised in its own component (an
advertised shortcut must target its component keypath, which is now a
registry value), as the ArtCraft Launcher's MSI already does.

Built and checked with WiX 5.0.2: full ICE validation and ICE50 pass, and
the built package's Property table, launch conditions, directory chain and
registry roots were read back from the MSI.
2026-10-27 12:01:33 +00: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
Davit Matchakhelidze 46f4e6ef59 Merge upstream main into ka-language 2026-10-27 15:43:01 +04:00
jonathanwxh-cell 56ef54cf4c Merge upstream main and resolve conflicts for PR #7621
Preserve the PR's intended behavior and regressions while retaining upstream module extraction and changes. Formatting and independent static review passed.

Local verification: Runtime tests and broader Clippy/WASM/integration gates remain unverified locally because of resource limits.

Local UI verification is incomplete. Hosted CI must establish the remaining gates; this commit does not claim the PR is ready to merge.
2026-10-27 19:34:27 +08:00
Don Omondi e53f822032 Retry SVG saves that change during a read without reporting an error
When the working file changed between settling and reading, the watcher
sent "The SVG is still being saved" to the UI as an error. Treat that
result as a retry: clear the pending stamp so the new save settles again,
and send nothing. Other read errors are still reported once.

Tests cover the retry, single reporting of other errors, queue
backpressure and receiver drop, and a stress run of atomic replacements
that must deliver only complete saves ending with the final one.
2026-10-27 14:29:53 +03:00
Vlad Grankovsky 8ca3410a54 Merge origin/main into codex/multi-channel-editing
Integrate main 7ac7b8b10 with selection morphology and cropped feather-mask optimizations. Preserve both progress-document histories.
2026-10-27 11:31:28 +01:00
Brennan StehlingandClaude Opus 5.5 b0688ee9a3 Render path: the status bar names a non-memory reason, and perf.gpuFallback follows the active document (#9328)
A reason other than the memory budget (a flipped view, Advanced Blending…)
now shows "CPU Rendering" even while the measured layer fit is over the
budget. perf.gpu_fallback is set in one place from the active document's
reason, also each frame after a switch of document, so a refresh of an
arranged cell or another window can't make it disagree with
perf.renderPath's current. The control protocol says a history entry's doc
is the changed document's id, or 0 for every document.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 02:07:25 -07:00
Brennan Stehling ae043f50a0 Render path: the adjustment preview's CPU-proxy reason has its own slot (#9328)
A clipped or Blend If adjustment preview runs on the CPU proxy. Its reason
lives in a slot of its own, separate from the canvas's per-document reasons
and the app-wide reason, so closing or retargeting the dialog ends only the
preview's entry and can never report the canvas back on the GPU.
2026-10-27 02:07:25 -07:00
Brennan StehlingandClaude Opus 5.5 63b718a0b3 Docs: perf.renderPath in the control protocol and the development guide (#9328)
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-27 02:07:25 -07:00
Don Omondi 285770532b Merge main into embedded vector save-back
Resolve conflicts with the engine's cmd/ module move and the per-crate
integration test binaries. Run a selected VectorCraft.app bundle directly
(identified by bundle id) and reject nested gzip in bounded SVG parsing.
2026-10-27 11:59:56 +03:00
PerchAnton 8bb0a5e674 Merge main and preserve automation root alias tests in extracted module 2026-10-27 10:27:26 +02:00
Khawar Zamman Wani 32e166b720 perf(selection): scope Color Range sampling to active bounds 2026-10-27 12:37:05 +05:30
Khawar Zamman Wani 67172a9d08 Merge origin/main into fix/6501-multi-layer-free-transform 2026-10-27 11:57:10 +05:30
Khawar Zamman Wani ec1ca061ef Merge origin/main into fix/8169-huge-tiff-open 2026-10-27 11:56:24 +05:30
Khawar Zamman Wani 26d0b9c41c Merge origin/main into select-mask-workspace 2026-10-27 11:55:36 +05:30
dotCooCoo 9ee59ff493 Keep Artboard filtering safe for deeply nested groups
Traverse artboard descendants with an explicit stack. Cover 16,384 nested
groups on a 128 KiB thread stack and retain selection-based filtering.
Merge main and move the control test into the extracted test module.
2026-10-26 22:38:45 -07:00
Khawar Zamman Wani e65f25fbeb perf(selection): crop Smooth and Feather command masks 2026-10-27 10:56:00 +05:30
dotCooCoo 8dd05a03bd Merge main into the Smart Object layer filter
Keep the Smart Object filter and missing-link state handling in the extracted
engine and UI modules. Retain the Histogram control documentation.
2026-10-26 22:17:11 -07:00
aiongg a27436adcb Merge main into perf/selection-morphology
Resolves the move of crates/engine/src/selection_cmds.rs to cmd/selection_cmds.rs: the two hunks apply at the new path, and modify_window.rs with its tests moves under cmd/selection_cmds/.
2026-10-27 04:27:45 +00:00
Khawar Zamman Wani f15c93ce73 Merge origin/main into pen-path-operations 2026-10-27 09:49:45 +05:30
Khawar Zamman Wani ba43eb3ea5 Merge origin/main into save-for-web-webp 2026-10-27 09:44:59 +05:30
Khawar Zamman Wani 2c2faad9ae Merge origin/main into fix/6501-multi-layer-free-transform 2026-10-27 09:42:36 +05:30
Khawar Zamman Wani 7d4a7801d3 Merge origin/main into fix/font-name-editable-9338 2026-10-27 09:37:31 +05:30
Khawar Zamman Wani c8e4c4fd5f Merge origin/main into select-mask-workspace 2026-10-27 09:32:39 +05:30
Khawar Zamman Wani 720cd37518 Merge origin/main into fix/8169-huge-tiff-open 2026-10-27 09:28:53 +05:30
Vlad Grankovsky 7ce7189e50 Merge origin/main into codex/multi-channel-editing
Port selected-colour editing through main d42f9da94 and its engine/UI
module layout. Preserve native channel targets, drawing previews, tone
editors and filter behavior in the split modules, with their existing
regressions and public facade exports.
2026-10-27 04:18:03 +01:00
David MannandClaude Opus 5.5 523c2cc8d3 Merge main into feat/auto-219-8-panel-command-check
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 03:08:53 +01:00
David MannandClaude Opus 5.5 c141af3f43 Merge main into fix/remove-enable-animations
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 02:59:30 +01:00