Commit Graph
11425 Commits
Author SHA1 Message Date
David Mann 9aa9064ce9 Merge main into feat/ui-217-4-save-in-background
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

# Conflicts:
#	docs/scorecard.md
2026-10-16 00:54:47 +02:00
David MannandClaude Opus 5.5 873a7a2d19 Paths: making a selection from a path deselects the path (#6079)
With the Pen or Path Selection tool, Ctrl/Cmd+Enter and the canvas menu's
Make Selection... now deselect the loaded path in the Paths panel, as in
Photoshop, and the canvas stops drawing (and editing) that Work Path until a
path is selected again or the Work Path changes (a new Pen path, Make Work
Path, path.set...). The path stays in the document. A shape layer's path or
vector mask stays the active path; the Paths panel's own Load path as
selection button is unchanged.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-16 00:51:08 +02:00
jonathnwxh 6b9fc995ce test: add explicit release cursor generation cost probe 2026-10-16 06:47:44 +08:00
jonathnwxh 79e827ce7a test: optionally capture actual pen cursor bitmaps 2026-10-16 06:47:09 +08:00
David Mann 1b435a6e0d Merge remote-tracking branch 'origin/main' into feat/history-snapshot-options
# Conflicts:
#	docs/scorecard.md
2026-10-16 00:47:05 +02:00
David Mann d94381edf0 Merge remote-tracking branch 'origin/main' into feat/tool-214-12-shape-feather
# Conflicts:
#	docs/scorecard.md
2026-10-16 00:46:45 +02:00
David MannandClaude Opus 5.5 f4f1065785 Move tool: Ctrl-hover shows the distance to another layer (#4946)
With Smart Guides on and the Move tool, holding Ctrl (Cmd on the Mac) with no
button down and hovering another layer now draws magenta measurement lines
with labels between the selected layers' bounds and that layer's: the gap
between facing edges, or the distances between corresponding edges on an axis
where the two overlap. Over empty canvas, the Background or the selection
itself the distances run to the canvas edges. While an Alt-drag duplicates the
layers, the distance from the original to the copy shows.

Overlay only: no command, no history state. The hovered layer is the
Auto-Select hit test, cached per document revision, selection and pointer
pixel. Values use the ruler unit.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-16 00:46:44 +02:00
jonathnwxh 7f81e3abae Merge remote-tracking branch 'origin/main' into investigate/6350-brush-cursor 2026-10-16 06:46:00 +08:00
jonathnwxh eb3191e9bf fix: apply pen orientation to cached brush cursor outlines 2026-10-16 06:46:00 +08:00
Gustavo Ziger cd1eb38bc5 Merge branch 'main' into feat/zoom-animation-566 2026-10-15 19:45:47 -03:00
David Mann a3fd9bffd7 Merge remote-tracking branch 'origin/main' into feat/history-snapshot-options
# Conflicts:
#	docs/ui-parity.md
2026-10-16 00:45:32 +02:00
Higgs32584andClaude Opus 5.5 c1c44507d1 Automation: file.new's profile path is an ambient read, gated like Assign Profile's (#321)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-15 18:40:18 -04:00
itsF4LCON a76d3295ba Type: the text caret shows on a white background (part of #6085)
In the Photoshop themes the caret was a 1.5 pt white line with a 0.75 pt
black hairline inside, so on a white background only a faint grey line
showed. It is now a solid 1 pt black line inside a 3 pt white halo, readable
on any background, in every theme.
2026-10-16 00:38:48 +02:00
Florent Siegenthaler cd53632b62 Merge branch 'main' into fr-complete-catalog
Resolve the new conflict in crates/ui-egui/src/i18n/fr.tsv: main's new rows
are kept as they are and the branch adds only the keys main lacks.
2026-10-16 00:36:48 +02:00
jonathnwxh addac100bf test: compare pen cursor with dab angle and static reference 2026-10-16 06:33:09 +08:00
Tanish Manku 2b3d05636f Follow-ups to #5801/#5859: precheck docs name the group nesting limit; precheck test covers valid ids and null; Free Transform refusals translated; stranded-backup error tested (#6365) 2026-10-15 15:32:08 -07:00
jonathnwxh 6755ab7f22 test: reproduce static brush cursor under pen rotation 2026-10-16 06:32:07 +08:00
Higgs32584andClaude Opus 5.5 944d0cf722 Path Selection: the canvas right-click opens the path menu, as the Pen's does (#1056)
The Path Selection and Direct Selection tools had no canvas menu, so Make Selection, Fill and
Stroke Path, Free Transform Path, Delete Path and the combine and style rows needed the Pen tool
or the Paths panel. Like Photoshop, their right-click now opens the path menu for the selected
path, with the Pen menu's rows and the same enablement.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-15 18:27:56 -04:00
itsF4LCON 0752cd8365 Merge remote-tracking branch 'upstream/main' into feat/6278-replace-color-result
# Conflicts:
#	crates/ui-egui/src/i18n/ko.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
2026-10-16 00:27:03 +02:00
Florent Siegenthaler 39922dc317 Merge branch 'main' into fr-complete-catalog
Resolve the new conflict in crates/ui-egui/src/i18n/fr.tsv: main's new row
is kept as it is and the branch adds only the keys main lacks.
2026-10-16 00:26:59 +02:00
Tanish Manku fdaa9b8316 Free Transform: New Layer applies the transform first; tests for switching tool, layer or New Layer (#5665, #5667) (#5859)
* Tests: Free Transform applies when another tool, layer or New Layer is picked (#5665, #5667)

Whole-app regression tests for the paths #5665 and #5667 report (a moved box, and a placed image moved or untouched; toolbar tool click, Layers panel row click, New Layer). They pass on main, so these issues don't reproduce here; the tests pin Photoshop's behaviour (apply, never silently cancel) while the reporters narrow down their environment.

* New Layer while Free Transform is open applies the transform first (History: the transform, then New Layer; a placed layer's step no longer swallows New Layer); tests: a real placed fixture, the New Layer button, History order

* Free Transform + New Layer: check the command can run before applying the transform; a refused transform keeps the box and the placed layer and returns the refusal

* Free Transform + New Layer: Session::precheck validates the call (params shape, New Layer's values, precondition) before the box is applied

* Free Transform + New Layer: commit-first only for PRECHECKED commands; precheck shares dispatch's admission checks (named-layer precondition, jobs, hidden target) and checks a named layer exists; Group from Layers documents its layer param; test: precheck agrees with execute

* Free Transform + New Layer: precheck resolves a layer given by name as the command does; Layer via Copy/Cut leave PRECHECKED (their failures show only when they run); rebased (lib.rs mod lines)
2026-10-15 15:26:13 -07:00
Tanish Manku 8376363d8c Shortcuts without the UI: shell commands and tools in the engine, reserved keys, set files (#5801)
* Shortcuts without the UI: shell commands and tools in the engine, reserved keys, set files

A retro against "everything is drivable headless; the UI is a layer" found the shortcut
work leaning on the UI. Fixed:

- The shell's command table (UI_COMMANDS: View › Zoom In, the panels…) moves into the
  engine as data (shell_commands::SHELL_COMMANDS; menus::UI_COMMANDS is now an alias), with
  the tools (shell_commands::TOOLS: id, Photoshop name, default key; a test keeps it equal
  to the toolbar). edit.keyboardShortcuts binds, lists, imports, exports and checks them for
  conflicts with no UI: a headless .kys import takes tool keys, and an export is the whole set.
  Tools may share a key (Shift cycling); a command given a tool's key takes it from them.
- Reserved system keys are refused by the engine (the dialog uses the same check) and left
  out of imported sets.
- importKys / exportKys / summarize take {"path": …} to read or write files, like
  actions.save; the automation gate refuses those paths for MCP.

* Keyboard shortcuts: bindings commit only after their exports are written (a bad target changes nothing); docs: the command knows the tools

* Keyboard shortcuts: both export targets are resolved and checked before either file is written; a failed later write removes the earlier one

* docs: reserved keys per platform

* Keyboard shortcuts export: files are staged next to their targets and moved into place only when all are written; a failure leaves the user's files untouched

* Keyboard shortcut exports all or nothing: unique create_new staging and backups beside each target, restored on any failure; the same target twice refused; docs: Ctrl+Shift+Esc

* Shortcut exports: a failed backup move removes its placeholder; undo restores backups without deleting first and names any it couldn't; read-only targets refused up front
2026-10-15 15:26:09 -07:00
Higgs32584andClaude Opus 5.5 5f9c7d307e New Document: Color Profile, the working space or another profile of the mode (#321)
Photoshop's New Document has Advanced Options › Color Profile; PhotoCraft's always opened in the
working space, so a document in another space had to be made and then assigned a profile.
`file.new` takes `profile` (working, a built-in id or an .icc path), checked against the colour
mode before the document opens, and the New Document dialog lists the working space (by its
profile) and the built-in and installed profiles of the mode's colour space. Changing the mode
drops a profile of the old space.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-15 18:25:28 -04:00
Tanish Manku b09aeae2e2 Low-Latency Drawing preference (vsync off, opt-in), plus present-mode overrides for testers (#1343) (#5274)
* PHOTOCRAFT_PRESENT_MODE / PHOTOCRAFT_FRAME_LATENCY launch overrides for latency A/B tests (#1343)

Linux traces put the remaining stroke latency in presentation queueing (the app's frame fits
in one refresh; the rest waits on the swap chain), and an NVIDIA user cured it by forcing
vsync off. Testers can now compare without rebuilding: PHOTOCRAFT_PRESENT_MODE (fifo,
mailbox, immediate, autovsync, autonovsync) and PHOTOCRAFT_FRAME_LATENCY (1-3), applied over
the platform default. Bad values are logged and ignored. The active mode is logged at start,
kept in GpuInfo.present and shown in every stroke trace line.

RTX 5090, Vulkan, 120 Hz: default autovsync/latency 1 waits 6 ms per 8.3 ms frame; mailbox
renders every 2.3 ms with 0.2 ms wait, so each vsync shows the newest frame.

* docs: present mode and frame latency overrides

* Present mode overrides never request a mode the driver may lack (Mailbox crashed on X11/NVIDIA)

* Preferences › Performance › Low-Latency Drawing, on by default: no vsync wait while drawing (#1343)

Testers' traces put the ~50 ms stroke lag in the swap chain's vsync wait. With vsync off it
disappears (X11/NVIDIA; Windows/NVIDIA via the driver), and a shorter queue doesn't help. The
surface now presents with AutoNoVsync by default: wgpu picks Immediate, else Mailbox, else
Fifo by what the driver offers, so no unsupported mode is ever requested. Turning the
preference off brings vsync back (smooth, but late). It applies at the next launch, like the
other graphics settings. Where only Immediate exists the canvas may tear while it changes;
frames render as fast as input arrives during a stroke and stop when idle.

* Runtime and launch controls: ui.set strokeTrace, --stroke-trace, --present-mode, --frame-latency

The retro's remaining gap: the stroke trace and the presentation overrides were env-only. The trace now switches at runtime over the control channel (ui.set {"strokeTrace": true|false|"stderr"|path}) and with --stroke-trace; --present-mode / --frame-latency sit beside their env vars and win over them. Bad values are reported and ignored; none fails a launch.

* docs: strokeTrace beside the other ui.set fields

* docs: regenerate the scorecard after rebasing onto main

* Low-Latency Drawing: frames capped at 240 fps without vsync (after #4472); ui.set strokeTrace takes on/off only (a CSV path is launch-only); tearing documented as usual (Immediate); pref hidden on web; doc comment order

* stroke_trace: from_value doc says ui.set passes only on or off

* Low-Latency Drawing ships off (opt-in), per the owner's decision

* docs: present mode default is vsync (Low-Latency Drawing ships off)
2026-10-15 15:23:47 -07:00
vngocvan 89d158c98a fix(pen): preserve stale drafts in their owning Work Path 2026-10-16 05:23:26 +07:00
itsF4LCON c04da11bb3 Smart filters: rustfmt 2026-10-16 00:16:06 +02:00
itsF4LCON 8176b613ca Smart filters: the dialog's preview window shows the edited filter too (#6324)
The filter dialog's own preview window matched the canvas preview by the
filter's command, but an edited smart filter previews as
layer.smartFilter.setParams, so the window kept the unfiltered image.
smart_ui::preview_command names the command the preview runs.
2026-10-16 00:15:50 +02:00
Omar Saidahmed bd0061e2a8 honor lock all on layer mask commands 2026-10-15 18:15:09 -04:00
a528b9993e fix(pen): guard every entry point against a stale path
Review on #5412: `sync_views` and `pen_commit` left three ways for a
control batch to reach another document's path in the same frame, before
the next sync. `cancel_stale` now also runs at the top of `pen_down`,
`curvature_down` and `pen_undo_last_point`, and `draw_overlay` draws the
path only on the document it was started on, as #5427 does.

The regression test covers all three entry points after a document switch
and the overlay, comparing the same view with and without the path so the
count measures the path alone.

Co-authored-by: Daktyl198 <2475672+Daktyl198@users.noreply.github.com>
Co-authored-by: Nigel Ihza Firdausy <106657905+Ni-zav@users.noreply.github.com>
2026-10-16 05:09:49 +07:00
vngocvan 590787b848 fix(pen): drop the Direct Selection with the stale path
`pen_commit` resets `ui.direct_selection` when it was targeting the Pen's
path; `cancel_stale` dropped the path without it, leaving the target
pointing at anchors that no longer exist. Spotted by @Daktyl198 on #5412.

The test now drives the Curvature Pen as well as the Pen through File >
New, and covers the Direct Selection reset.
2026-10-16 05:09:49 +07:00
vngocvan 4e131ecf2d fix(pen): an unclosed path stays with its document (#5373)
Leaving a path open with the Pen and creating a new document showed that
path on the new document: `UiState::pen` had no document owner, so it
survived the switch.

Follow-up to #5015, which did the same for the Polygonal Lasso. The path
now remembers the document it was started on (`UiState::pen_doc`, set at
its first anchor by `pen_down` and `curvature_down`) and is dropped when
another document becomes active, as the Polygonal Lasso and the Crop tool
already do.

`cancel_stale` also runs at the top of `pen_commit`: the control channel is
drained after `sync_views` (`logic` calls them in that order), so a
document switch in the same frame would otherwise commit the path into the
wrong document. The Crop tool guards its commit path the same way.

Adds a regression test that File > New drops the path, that a switch before
the commit writes it to neither document, and that it still commits to the
document it was drawn on.
2026-10-16 05:09:49 +07:00
itsF4LCON 8369b4b55c File › Open: a file type filter per format (#6337)
After All Formats the Open dialog listed only PhotoCraft, OpenRaster, Krita,
SVG and Paint.NET. Every format it reads now has its own filter (Photoshop,
Affinity, HEIF, PNG, JPEG, TIFF, Portable Bitmap, OpenEXR, Radiance HDR,
camera raw, …), and together they cover All Formats exactly.
2026-10-16 00:04:50 +02:00
skylar taylor-barrick af54f4aed1 ci: limit the font pass to font-consuming crates (#6127)
Keep the full workspace and feature build selection while running the craft-fonts pass only for text, io and ui-egui. Ordinary workspace test coverage remains in the first test pass.
2026-10-15 16:03:39 -06:00
skylar taylor-barrick 1a4167936e ci: run tests with cargo nextest (#6118)
Run workspace tests with pinned cargo-nextest, a CI fail-fast profile and a ten-minute per-test hang limit. Keep cheap checks first and doctests in a separate step so failures propagate on Windows.
2026-10-15 16:02:57 -06:00
itsF4LCON f71eb28f84 Replace Color: a Result swatch whose Color Picker sets the sliders (#6278)
Photoshop's Replace Color shows the replacement colour under the Hue,
Saturation and Lightness sliders; picking one in its Color Picker sets the
sliders so the sampled colour becomes it. tone::replace_color_result gives
the swatch (the sampled colour after the shift) and tone::replace_color_shift
the slider values for a picked colour.
2026-10-15 23:55:58 +02:00
David Mann 2905c329e6 Merge remote-tracking branch 'origin/main' into fix/5532-blend-separators
# Conflicts:
#	crates/ui-egui/src/panels.rs
2026-10-15 23:52:50 +02:00
David Mann bbd5ed2205 Merge remote-tracking branch 'origin/main' into fix/5559-bitmap-dialog
# Conflicts:
#	crates/ui-egui/src/i18n/cs.tsv
#	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/hu.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/sr.tsv
#	crates/ui-egui/src/i18n/tr.tsv
#	crates/ui-egui/src/i18n/uk.tsv
#	crates/ui-egui/src/i18n/vi.tsv
#	crates/ui-egui/src/i18n/zh-hans.tsv
#	crates/ui-egui/src/i18n/zh-hant.tsv
2026-10-15 23:52:42 +02:00
David Mann 8aad373863 Merge remote-tracking branch 'origin/main' into fix/snapshot-followups
# Conflicts:
#	docs/ui-parity.md
2026-10-15 23:52:29 +02:00
David Mann ce19e018b9 Merge remote-tracking branch 'origin/main' into feat/tool-214-12-shape-feather
# Conflicts:
#	docs/ui-parity.md
2026-10-15 23:52:29 +02:00
itsF4LCON 0504331c51 Smart filters: an edited filter's dialog previews again (#6324)
Re-opening a smart filter dropped the dialog's Preview, since the live
preview ran the filter command and would have stacked a second copy. The
preview now runs layer.smartFilter.setParams on the proxy, as OK does, at
full size and reduced afterwards (the smart object renders again from its
source, which the proxy doesn't scale), so it shows the filter replaced in
its stack.
2026-10-15 23:46:54 +02:00
jonathnwxh f4842a04e8 Merge upstream multi-layer blending and preserve viewport refresh limits 2026-10-16 05:44:29 +08:00
itsF4LCON 4258089716 Replace Color: the sample eyedropper is armed when the dialog opens (#6279)
Photoshop's first click on the image after opening Replace Color samples the
colour. The dialog now opens (and resets) with its canvas eyedropper active;
the pipette button still turns it off and on.
2026-10-15 23:38:01 +02:00
Tanish Manku 54f4baf6f9 Layers panel: blend mode, Opacity, Fill and locks change every selected layer; Photoshop's History names (#5856)
* Layers panel: blend mode, Opacity, Fill and locks change every selected layer; Photoshop's History names

With several layers selected, the Layers panel's blend mode, Opacity, Fill and lock controls
changed only the active layer, silently (the layers audit's top panel gap). They now change
every selected layer, as in Photoshop, in one undo step. layer.setProps takes
"layers": [id, …] for that (headless too); a list with an unknown id, a bad shape, or a
name for several layers is an error that changes nothing.

History names follow Photoshop for a single kind of change: Opacity Change, Fill Opacity
Change, Blending Change, Rename Layer (a mix stays Layer Properties).

* Layers panel with several selected: Pass Through only for groups (refused for other layers), the Basic lock toggle and the blend-mode hover preview take every selected layer, the controls grey with the Background selected; History icon for opacity/fill/blend changes

* Layers panel: leave the Background-in-a-selection behaviour as it was until Photoshop's is confirmed (#5856)

* Layers panel: a selected Background is left out of several-layer Opacity, Fill, blend and lock changes until Photoshop's behaviour is confirmed (#5856)
2026-10-15 14:33:51 -07:00
Higgs32584andClaude Opus 5.5 a008842a85 Help › Search: ← / → and Space edit the field instead of driving the menu
While a text field in an open menu has the keyboard, Nav::keys leaves
← / → (cursor) and Space (a typed space) to it: ← / → no longer switch
Help to Window / File, and Space no longer runs the lit result. ↑ / ↓,
↩ and Esc are unchanged. Follow-up to #5996 / #6030 (letters).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-15 17:32:01 -04:00
David MannandClaude Opus 5.5 b43be75264 PSD: Wind, Extrude and Tiles smart filters open and save like Photoshop (#6314)
Wind, Extrude and Tiles applied as smart filters were dropped from PSD
saves with a warning, and the same filters in a Photoshop PSD opened only
as verbatim, uneditable entries. smart_map.rs now maps them both ways in
filterFX:

- Wind (`Wnd `, filterID 1466852384): `WndM` enum (`Wnd `/`Blst`/`Stgr`)
  <-> method; `Drct` enum: `Left` <-> fromRight (streaks extend to the
  left), `Rght` <-> fromLeft.
- Extrude (`Extr`, 1165522034): `ExtT` enum (`Blks`/`Pyrm`) <-> type,
  `ExtS`/`ExtD` long <-> size/depth, `ExtR` enum (`Rndm`/`LvlB`) <->
  depthMode, `ExtF`/`ExtM` bool <-> solidFrontFaces/maskIncompleteBlocks.
- Tiles (`Tls `, 1416393504): `TlNm`/`TlOf` long <-> count/maxOffset,
  `FlCl` enum (`FlBc`/`FlFr`/`FlIn`/`FlSm`) <-> fill; the entry's
  `FrgC`/`BckC` <-> foreground/background.

Our random seed has no PSD key and is not written. Missing keys, wrong
value types, out-of-range numbers and unknown enum values keep the entry
verbatim; params with no PSD equivalent are reported, never guessed.

Measured in Photoshop: applied through Action Manager to a smart object,
saved, filterFX read back; each code also checked on a test image (pixels
compared). Scorecard FILE-215-2 note and file-format parity updated.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-15 23:30:11 +02:00
David MannandClaude Opus 5.5 badfd6df70 PSD: Mezzotint and Color Halftone smart filters open and save like Photoshop (#6316)
Mezzotint and Color Halftone applied as smart filters were dropped from PSD
saves with a warning, and the same filters in a Photoshop PSD opened as
unsupported (verbatim) smart filters. smart_map.rs now maps them both ways:

- Mezzotint: filterID/class `Mztn`, `MztT` enum (FnDt, MdmD, GrnD, CrsD,
  ShrL, MdmL, LngL, ShSt, MdmS, LngS) <-> `type` (fineDots .. longStrokes).
  PhotoCraft's `seed` has no Photoshop equivalent and is not saved.
- Color Halftone: filterID/class `ClrH`, `Rds ` and `Ang1`-`Ang4` longs <->
  `maxRadius`, `channel1`-`channel4`, written within the dialog ranges
  (4..127, -360..360).

Unknown enum codes, wrong value types and out-of-range values are kept
verbatim as unsupported filters, never a panic.

Measured in Photoshop: applied through Action Manager to a smart object,
saved, filterFX read back; codes confirmed by rendering each option.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-15 23:27:41 +02:00
Theo Wilenius 26cc0369ee Guides: a ruler drop removes the guide even when the drag held its own axis
Review found that a horizontal guide dragged sideways onto the left ruler keeps
its y, and that reads as a click on the guide: the click branch selected it and
returned before the ruler drop was considered, so the guide survived the drop.

Require `!over_ruler` in that branch, so a drop on a ruler always removes the
guide, and cover the constant-axis case in the direct test and in the canvas
test, which now runs the gesture at two release offsets. `dropped_on_a_ruler` is
now the strips `content_rect` trims off the canvas rect, strictly outside it,
with the boundary, corner and outside-rect cases asserted.
2026-10-16 00:23:51 +03:00
Florent Siegenthaler fdb9f014c4 Merge branch 'main' into fr-complete-catalog
Resolve the new conflict in crates/ui-egui/src/i18n/fr.tsv: main's new rows
are kept as they are and the branch adds only the keys main lacks.
2026-10-15 23:21:36 +02:00
Tanish Manku 3cd0f6c954 Keyboard Shortcuts: Accept and Go to Conflict / Undo Changes, and reserved keys (K4a) (#5349)
* Keyboard Shortcuts: Accept and Go to Conflict / Undo Changes, and reserved keys (K4a)

A key that another command holds now offers Photoshop's two answers under the warning.
Accept and Go to Conflict takes the key from the other command at once (its main key or
an alternate) and selects it for a new one. Undo Changes puts the edited command's main and
further keys back as they were. OK without either still accepts, as in Photoshop.

Keys the system takes before the app sees them are refused with a message: Alt+Tab,
Alt+F4, Ctrl+Alt+Delete, Ctrl+Esc and Ctrl+Shift+Esc off the Mac; Cmd+Tab, Cmd+` and
Cmd+Opt+Esc on it.

* Keyboard Shortcuts: a conflict goes stale when the bindings change after it (Reset All, Use Default, Delete, ×, Escape, a set switch); Accept takes the key from every holder; Linux reserves its own keys; doc comment back on shortcut_text
2026-10-15 14:18:14 -07:00
Tanish Manku 04db697b5d Paste Layer Style: a group's Pass Through pastes onto other layers as Normal; style clipboard comment (#6310) 2026-10-15 14:17:22 -07:00