Kaedo17
adaba2a34e
style: split the glide-choice assignment for rustfmt
...
cargo fmt --all -- --check on the merge commit flags only the
glide_scroll_all assignment added by the conflict resolution: the merge
produced it as one long line, and rustfmt wants the call on its own line.
No behaviour change (cloutier, #9841 ).
2026-11-09 12:45:29 +08:00
Kaedo17
2f45dd691f
Merge remote-tracking branch 'upstream/main' into fix/zoom-tool-context-menu
2026-11-09 12:42:28 +08:00
Dylan M. Taylor
9394960e42
Merge pull request #12435 from dotCooCoo/chore/craft-update-1b34eba41
...
Updates: take craft-update from craft-libs main at 1b34eba41
2026-11-08 23:35:14 -05:00
dotCooCoo
2ea37fc849
Updates: take craft-update from craft-libs main at 1b34eba41
2026-11-08 19:44:03 -08:00
Dylan M. Taylor
95c9e465df
Merge pull request #12384 from dotCooCoo/chore/craft-update-updater-fixes
...
Updates: the updater reports installing, ready, installed and failed, and installs at exit
2026-11-08 22:12:53 -05:00
David Mann
a7dfcf5100
Merge pull request #11853 from DuBearte/fix/11775-count-record-label
...
fix(engine): Record Measurements labels a Count tool row "Count N" (#11775 )
2026-11-09 02:48:54 +01:00
David Mann
8892640978
Merge pull request #9272 from hectorviov/fix/hue-range-zone-drag
...
feat(ui): drag the zones of a Hue/Saturation colour range (#9252 )
2026-11-09 02:00:39 +01:00
David Mann
bade1134b2
Merge branch 'main' into fix/11775-count-record-label (merge queue)
2026-11-09 01:45:17 +01:00
Kaedo17
6a5b9efdc1
Merge upstream/main into fix/zoom-tool-context-menu
...
Clears the merge conflict reported for #9841 . One conflict hunk, in
crates/ui-egui/src/canvas.rs: upstream's Scroll All Windows (#9144 ) added
the scroll_all/glide block next to the flick-pan call the dismissal gates
touch. Resolution keeps upstream's block wholesale and applies the
menu-dismissal gate to both spots it reaches: the glide choice (a
dismissal press is no pan, so it neither arms the glide nor moves the
other views) and the flick frame. Everything else auto-merged.
2026-11-09 08:02:25 +08:00
David Mann
f88fa5e431
Merge remote-tracking branch 'origin/main' into pr-9272
...
# Conflicts:
# docs/ui-parity.md
2026-11-09 00:49:57 +01:00
David Mann
eda0af1911
Merge pull request #12395 from hsmith-dev/fix/cam-options-bar
...
Show Content-Aware Move's slider popups, tooltips, and transform actions
2026-11-09 00:28:27 +01:00
David Mann
4fb17729b3
Merge pull request #12186 from davidmann4/fix/11908-bg-eraser-angle-pressure
...
Background Eraser: Angle and Pressure for Size on the options bar (#11908 )
2026-11-09 00:26:38 +01:00
David Mann
8e3152474c
Merge pull request #12389 from hsmith-dev/fix/cam-transform-on-drop-default
...
Turn Content-Aware Move's Transform On Drop on by default
2026-11-09 00:17:33 +01:00
David Mann
a76bb72b1f
Merge pull request #10569 from hectorviov/feat/layer-copy-css
...
Layer › Copy CSS
2026-11-09 00:17:21 +01:00
David Mann
58115359a0
Merge pull request #12153 from davidmann4/fix/11903-bg-eraser-protect-fades
...
Background Eraser: Protect Foreground Color fades with the distance (#11903 )
2026-11-09 00:17:09 +01:00
David Mann
44552ca97f
Merge pull request #12191 from davidmann4/fix/11905-bg-eraser-transparency-lock
...
Background Eraser: erase transparency-locked layers (#11905 )
2026-11-09 00:15:40 +01:00
David Mann and Claude Opus 5.5
bf7d942f92
Address CodeRabbit review: Angle alert survives the window losing focus
...
Response::has_focus() is false while the window is in the background,
so the guard dropped a pending out-of-range entry; check the widget's
own focus instead.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-08 23:42:18 +01:00
David Mann
a0dd7d74b2
Merge remote-tracking branch 'origin/main' into HEAD
2026-11-08 23:30:59 +01:00
David Mann
6cb32d2759
Merge pull request #12354 from RickiNano/fix/cam-no-pixels-alert-12192
...
Content-Aware Move: warn "No pixels are selected." for a drag with no area (#12192 )
2026-11-08 23:30:29 +01:00
David Mann and Claude Opus 5.5
91f8b1104d
Merge main into fix/11903-bg-eraser-protect-fades
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-11-08 23:30:19 +01:00
David Mann
3ef7bd1183
Merge pull request #12277 from hectorviov/fix/eraser-range-alerts
...
Eraser: Opacity, Flow and Smoothing out of range show the Closest value inserted alert (#11938 )
2026-11-08 23:29:40 +01:00
David Mann
6883520bcf
Merge pull request #12383 from rmsff/fix/healing-reset-tip-12099
...
fix(ui): Reset Tool gives the Healing Brush a 19 px hard tip at 25 % spacing (#12099 )
2026-11-08 23:29:29 +01:00
David Mann
a2cae35d4e
Merge pull request #7809 from andeecollard/codex/macos-shortcuts
...
Use standard macOS Settings, Hide and Minimize shortcuts
2026-11-08 23:29:18 +01:00
David Mann
d9e46405b6
Merge pull request #12329 from rmsff/fix/type-tool-locked-layer-alert-12040
...
fix(ui): a Type tool click on a Lock All text layer shows the locked alert (#12040 )
2026-11-08 23:29:05 +01:00
David Mann
a33af67a9c
Merge pull request #12312 from tjbbjt/fix/free-transform-stalls
...
Free Transform: redraw only what the box changes; prepare large layers as a job
2026-11-08 23:28:49 +01:00
David Mann
f8c11762e7
Merge pull request #9144 from dotCooCoo/feat/hand-scroll-all-windows
...
Hand tool: Scroll All Windows, or Shift while dragging, scrolls every shown document
2026-11-08 23:28:38 +01:00
David Mann
6c610a73f6
Merge pull request #9981 from ljkx/feat/smart-sharpen-canvas-preview
...
Filter dialogs: a click on the image centres the preview window (#9648 )
2026-11-08 23:28:27 +01:00
David Mann and Claude Opus 5.5
c571f81b1c
Merge main into fix/11905-bg-eraser-transparency-lock
...
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com >
2026-11-08 23:25:35 +01:00
David Mann
5594d18d18
Merge origin/main into feat/hand-scroll-all-windows
2026-11-08 22:24:12 +01:00
David Mann
bdcbb0fa93
Merge origin/main into fix/hue-range-zone-drag
2026-11-08 22:24:05 +01:00
David Mann
0832f01bb7
Merge origin/main into feat/smart-sharpen-canvas-preview
2026-11-08 22:24:00 +01:00
David Mann
118fc0da6b
Merge remote-tracking branch 'origin/main' into HEAD
2026-11-08 22:17:36 +01:00
David Mann
70c0911d4e
Merge pull request #12399 from davidmann4/fix/12397-wand-seed-tests-antialias
...
Magic Wand seed-outside tests expect the measured Anti-alias fringe, main green again (#12397 )
2026-11-08 21:57:33 +01:00
David Mann
dff5d29584
Merge remote-tracking branch 'origin/main' into fix/12397-wand-seed-tests-antialias
2026-11-08 21:03:43 +01:00
David Mann and Claude Opus 5.5
bfe5d2a671
Magic Wand seed-outside tests: keep Anti-alias on, expect the measured fringe ( #12397 )
...
Instead of turning Anti-alias off, the tests keep the default setup and
expect the reference application's measured results (#11776 , #11779 ):
the selection ends at 381, Subtract at 219, Intersect runs 219-381.
Suggested by hectorviov on #12399 .
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-08 21:03:37 +01:00
David Mann and Claude Opus 5.5
4e43c23e43
Magic Wand seed-outside tests: Anti-alias off, so they test the modes with hard edges ( #12397 )
...
#12146 gives near-matching neighbours a soft fringe when Anti-alias is on.
The #11848 tests left Anti-alias at its default and expected exact column
bounds, so main's engine tests failed (381 instead of 380).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-08 20:31:42 +01:00
e9cac335b4
Regenerate the parity checklist and scorecard after merging main into #10569
...
Co-Authored-By: hectorviov <hectorviov@users.noreply.github.com >
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-08 20:25:11 +01:00
David Mann
a879c6ac0a
Merge main into #10569
...
# Conflicts:
# crates/ui-egui/src/menu_catalog.rs
2026-11-08 20:20:12 +01:00
David Mann
a17acfa7a7
Merge pull request #12049 from DuBearte/fix/11897-clear-on-background
...
Brush: Clear on the Background paints as Normal and the Mode reads Normal
2026-11-08 20:16:11 +01:00
David Mann
3ef886c2e0
Merge pull request #12382 from TrevorBrown-dev/fix/layer-via-copy-capital-12357
...
Menus: Layer Via Copy and Layer Via Cut with a capital V, as in the reference (#12357 )
2026-11-08 20:10:52 +01:00
David Mann
8acd45bfa9
Merge pull request #12298 from TrevorBrown-dev/fix/patch-destination-selection-12119
...
Patch: in Destination mode the selection moves with the patch (#12119 )
2026-11-08 19:56:56 +01:00
David Mann
4e5f150eb4
Merge pull request #12146 from hectorviov/fix/wand-antialias-fringe
...
Magic Wand: Anti-alias keeps the region whole and softens only near-matching neighbours (#11776 )
2026-11-08 19:49:41 +01:00
David Mann
5b0c31fc47
Merge pull request #11845 from mzuniga37/fix/11770-count-click-shows-count
...
Count tool: adding a marker turns View > Show > Count back on (#11770 )
2026-11-08 19:49:27 +01:00
David Mann and Claude Opus 5.5
f72fd4649e
Merge origin/main into #12153 : Protect Foreground narrows the graded Tolerance
...
main brought the graded erase (#11901 ), decontamination (#11902 ) and graded
Find Edges (#11904 ) into bg_erase.rs, and kept Protect Foreground Color on the
largest per-channel difference to the foreground. Resolved by narrowing the
Tolerance itself: with protection on, graded_weight runs on min(Tolerance,
distance from the sample to the foreground); a foreground equal to the sample
erases nothing. This replaces the distance stretch from before the merge.
Measured in the reference application with the issue's drag, foreground off in
two channels: (100,140,40) gives 0 32 75 112 156 196 238 255 (no protection),
(150,90,40) the block-5 row, (230,90,40) and (200,90,70) a Tolerance of 50
levels. So the narrowing uses the sample-match distance (largest increase plus
largest decrease), not the largest per-channel difference: the test on main
that kept the sampled colour for a two-channel foreground is replaced by these
rows. The reference rows of #11903 now match within 8 levels, 8- and 16-bit.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-08 19:44:24 +01:00
David Mann
f235e9f30c
Merge pull request #12154 from davidmann4/fix/11902-bg-eraser-decontamination
...
Background Eraser: partly erased pixels lose the sampled colour's tint (#11902 )
2026-11-08 19:34:28 +01:00
David Mann
83e2172336
Merge pull request #11848 from DuBearte/fix/11779-wand-seed-outside
...
fix(engine): Magic Wand Subtract and Intersect grow from the seed through the selection (#11779 )
2026-11-08 19:33:29 +01:00
Harrison Smith
5dc2ad27fb
Show Content-Aware Move's slider popups, tooltips, and transform actions
...
Structure and Color open a whole-number slider. A typed value outside the range
opens an OK alert and keeps the closest value. While the Transform On Drop box
is up, the bar is greyed and Cancel then Commit sit at the right end.
Fixes #12193
2026-11-08 11:28:47 -07:00
David Mann
fa41efebc5
Merge pull request #9348 from VoiceLessQ/pattern-preview-wrap-tools
...
paint: 12 more painting tools wrap across the canvas edges in Pattern Preview (#8883 )
2026-11-08 19:22:34 +01:00
David Mann
9eb2abcf33
Merge pull request #9396 from kavishkashehan726-sudo/fix/9356-pen-continue-path
...
Pen: carry on a shape's or vector mask's open path, and show the cont…
2026-11-08 19:22:19 +01:00
David Mann
40c310dfa3
Merge pull request #5224 from augrclk/fix/brush-spacing-row
...
Brush Settings: combine the Spacing checkbox and percentage header
2026-11-08 19:22:06 +01:00