Dylan M. Taylor
0d4d506cbf
Merge main shortcut test and dependency fixes
2026-11-15 16:47:34 -05:00
Dylan M. Taylor
c1f1b42906
Merge pull request #15190 from storytold/codex/photo-shortcut-lock-order
...
Fix shortcut test setup and preserve canonical Cargo lock order
2026-11-15 16:41:35 -05:00
David Mann
d547d50c7e
Merge pull request #15196 from davidmann4/fix/main-green-lockfile-test
...
Main green: action shortcut test by index, Cargo.lock order (#15195 )
2026-11-15 21:30:18 +01:00
Dylan M. Taylor
2d74ae4aab
io: retain note popup normalization and target layered TIFF tests
2026-11-15 15:14:57 -05:00
Dylan M. Taylor
463baf8d33
deps: bump tar, zip, roxmltree, rustls-webpki and symphonia to their latest versions ( #15209 )
...
- `roxmltree`: 0.20.0, 0.21.1 → 0.20.0, 0.21.2
- `rustls-webpki`: 0.103.15 → 0.103.16
- `zip`: 9.1.0 → 9.1.3
Lockfile only.
2026-11-15 14:41:22 -05:00
Dylan M. Taylor
e879da042c
fix: preserve bounded annotation text and unchanged legacy bytes
2026-11-15 14:22:37 -05:00
Dylan M. Taylor
3c3976e4b9
Merge current main while preserving shared annotation codec
2026-11-15 14:13:07 -05:00
David Mann and Claude Opus 5.5
f8b8243ce9
Cargo.lock: sort photocraft-text's dependencies the way cargo writes them
...
The gate's `git diff --exit-code -- Cargo.lock` step fails on main because
craft-plist sits before base64 in photocraft-text's list; cargo re-sorts it on
every build.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-11-15 19:48:25 +01:00
dotCooCoo
24550340c2
Keyboard Shortcuts test: add the action before assigning its key by index
...
#11674 changed `assign_shortcut` to take the action's index in the
Actions list instead of its name, while #14326 's
`an_action_function_key_is_no_edit` still passed "Sepia". The ui-egui
lib tests on main no longer compile (E0308 at
shortcut_set_switch_tests.rs:168). The test now adds a "Sepia" action
and assigns F2 to index 0, as the shortcut_dispatch tests do.
2026-11-15 19:48:04 +01:00
Dylan M. Taylor
f3419cc575
Keep text dependencies in canonical Cargo lock order
2026-11-15 18:26:21 +00:00
Dylan M. Taylor
41c571abf7
Merge branch 'main' into fix/action-shortcut-test-index
2026-11-15 12:13:44 -05:00
David Mann
eea5859589
Merge pull request #15171 from davidmann4/fix/artboards-to-files-order-test-names
...
Artboards to Files order test: expect the new file names (#15170 )
2026-11-15 17:43:21 +01:00
David Mann
415c03e28a
Merge pull request #15142 from RickiNano/layers-menu-duplicate-14615
...
Layers panel menu: Duplicate Layer… after New Group… (#14615 )
2026-11-15 17:43:08 +01:00
David Mann
e17a1cc56b
Merge pull request #14599 from TrevorBrown-dev/fix/artboard-from-group-label-14548
...
Layer > New: Artboard from Group without an ellipsis, as it opens no dialog (#14548 )
2026-11-15 17:42:54 +01:00
dotCooCoo
edfdc63312
Keyboard Shortcuts test: add the action before assigning its key by index
...
#11674 changed `assign_shortcut` to take the action's index in the
Actions list instead of its name, while #14326 's
`an_action_function_key_is_no_edit` still passed "Sepia". The ui-egui
lib tests on main no longer compile (E0308 at
shortcut_set_switch_tests.rs:168). The test now adds a "Sepia" action
and assigns F2 to index 0, as the shortcut_dispatch tests do.
2026-11-15 08:28:08 -08:00
Dylan M. Taylor
3713b02f78
Merge pull request #15125 from storytold/dot/photo-plist-shared
...
Use shared binary plist lookup for macOS locale
2026-11-15 10:56:32 -05:00
David Mann
0362120fc4
Merge pull request #11674 from yoriswind/codex/actions-library-commands-10706
...
Add Clear All, Reset, and Replace Actions to the Classic panel
2026-11-15 16:53:01 +01:00
David Mann
42e9467bf9
Artboards to Files order test: expect the <prefix><name> file names ( #15170 )
...
#13641 renamed the exported files to <prefix><artboard name> with spaces
as hyphens; the order test from #13670 still expected the old
p_0000_Empty Board.png names and failed on main. Assert all three names
in top-first order.
2026-11-15 16:41:17 +01:00
Dylan M. Taylor
dd768fcd7e
Merge pull request #11433 from faseJade/refactor/one-base64
...
refactor: one base64 decoder, from the base64 crate
2026-11-15 10:29:01 -05:00
David Mann
5ed5a10997
Merge pull request #15110 from Bobderto/codex/14983-satin-size-one
...
Render the measured Satin Size 1 edge on CPU and GPU
2026-11-15 16:13:36 +01:00
Dylan M. Taylor
9883bec6b2
Merge pull request #15098 from storytold/dot/photo-pctip
...
Preset store: replace local PCTIP1 codec with craft-libs
2026-11-15 10:11:27 -05:00
Dylan M. Taylor
3f29649ff4
test(io): handle fallible palette PSD conversion results
2026-11-15 10:10:39 -05:00
David Mann
72d8be6ed8
Merge pull request #15139 from hectorviov/fix/frame-size-readout
...
Frame tool: a W / H readout beside the pointer while drawing
2026-11-15 16:07:35 +01:00
David Mann
f7c78b2041
Merge pull request #15075 from RickiNano/fix/14593-duplicate-drops-selection
...
Image > Duplicate: the copy starts without a selection (#14593 )
2026-11-15 16:07:24 +01:00
David Mann
4746ece134
Merge pull request #14627 from TrevorBrown-dev/fix/canvas-size-step-default-anchor-14544
...
Actions: a Canvas Size step without anchor keys plays back at the top left (#14544 )
2026-11-15 16:05:26 +01:00
David Mann
9dcb58a5b4
Merge pull request #14591 from TrevorBrown-dev/fix/canvas-size-noop-history-14537
...
Canvas Size: an unchanged size adds no history step (#14537 )
2026-11-15 16:05:14 +01:00
David Mann
7ab7189f8c
Merge pull request #14564 from TrevorBrown-dev/fix/canvas-size-drops-selection-14539
...
Canvas Size: the selection is dropped, one undo brings it back (#14539 )
2026-11-15 16:05:01 +01:00
David Mann
f46e7b6c9c
Merge pull request #14534 from TrevorBrown-dev/fix/rotate-canvas-drops-selection-14507
...
Rotate Canvas: the selection is dropped, one undo brings it back (#14507 )
2026-11-15 16:04:48 +01:00
David Mann
9df0094e90
Merge pull request #14527 from TrevorBrown-dev/fix/apply-data-set-history-name-14498
...
Apply Data Set: the history state is named Apply Data Set (#14498 )
2026-11-15 16:04:36 +01:00
David Mann
ef8806842b
Merge pull request #14228 from TrevorBrown-dev/fix/save-a-copy-unsaved-name-14169
...
Save a Copy: a document never saved suggests its own name, without " copy" (#14169 )
2026-11-15 16:04:25 +01:00
David Mann
e7702ca7b3
Merge branch 'main' into fix/save-a-copy-unsaved-name-14169 (merge queue)
...
# Conflicts:
# crates/ui-egui/src/menus/view_cmds.rs
2026-11-15 16:04:20 +01:00
David Mann
d3249c4ad9
Merge pull request #15054 from RickiNano/feat/14789-image-size-resample-shortcuts
...
Image Size: Alt+1 to Alt+8 pick the Resample method (#14789 )
2026-11-15 16:02:04 +01:00
David Mann
72719047b2
Merge pull request #15131 from hectorviov/fix/frame-space-move
...
Frame tool: Space moves the frame being drawn
2026-11-15 16:01:51 +01:00
David Mann
1a4f3ff9f6
Merge pull request #13679 from wanikhawar/fix/13249-line-tool-canvas-menu
...
Line tool: the shape and path canvas menu in Shape mode (#13249 )
2026-11-15 16:01:39 +01:00
David Mann
c7bb903af2
Merge pull request #15128 from hectorviov/fix/fit-image-sticky
...
Fit Image opens with the values it last ran with
2026-11-15 15:58:58 +01:00
David Mann
57bdedf9ab
Merge pull request #15028 from hectorviov/fix/export-scale-all
...
Export As: Scale All rows write one file per size with its suffix
2026-11-15 15:58:45 +01:00
David Mann
dee4381c21
Merge pull request #15039 from hectorviov/fix/layer-export-folder
...
Layer › Export As: several files go into a folder as <layer name>.<ext>
2026-11-15 15:58:33 +01:00
David Mann
b78ee402be
Merge pull request #14367 from rmsff/fix/lens-auto-scale-corners-13992
...
Lens Correction: Auto Scale keeps the border pixels clear of the Edge fill
2026-11-15 15:58:21 +01:00
David Mann
30341b3856
Merge pull request #14576 from RickiNano/fix/14034-new-doc-pixel-aspect
...
New Document: Pixel Aspect Ratio under Color Profile, Square Pixels by default (#14034 )
2026-11-15 15:58:09 +01:00
David Mann
ad9955e1f2
Merge pull request #14497 from RickiNano/feat/14030-new-doc-bitmap-mode
...
New Document: Bitmap colour mode at 1 bit, without Transparent (#14030 )
2026-11-15 15:57:57 +01:00
David Mann
80aeb3573d
Merge pull request #14477 from RickiNano/fix/14042-web-mobile-artboards
...
New Document: Web and Mobile presets turn Artboards on (#14042 )
2026-11-15 15:57:45 +01:00
David Mann
52d2e76357
Merge pull request #14475 from RickiNano/fix/14043-new-doc-save-preset-icon
...
New Document: save a preset from an icon right of Name (#14043 )
2026-11-15 15:57:33 +01:00
David Mann
fdb793c9a1
Merge pull request #11410 from chamber074/fix/outer-glow-contour
...
Outer Glow: a flat contour paints the whole rectangle (#11361 )
2026-11-15 15:57:20 +01:00
David Mann
6ba0ca60c6
Merge pull request #13756 from rmsff/fix/direct-selection-alt-drag-duplicate-13211
...
Direct Selection: Alt-drag on a segment duplicates its subpath
2026-11-15 15:57:05 +01:00
David Mann
b748dcf7b5
Merge pull request #14707 from hectorviov/fix/count-group-name-dialog
...
Count tool: "Count Group Name" dialog for new groups and Rename… (#11766 )
2026-11-15 15:54:50 +01:00
David Mann
401c5d1a9f
Merge pull request #14864 from hectorviov/fix/shortcut-set-switch-prompt
...
Keyboard Shortcuts: switching away from a modified set asks Save first? Yes / No / Cancel
2026-11-15 15:54:38 +01:00
David Mann
a89a6b2f0a
Merge pull request #14978 from hectorviov/fix/ruler-move-whole
...
Ruler: a drag on the line or a protractor's vertex moves the whole ruler; ±8 px end zones
2026-11-15 15:54:25 +01:00
David Mann
067aba006a
Merge branch 'main' into fix/ruler-move-whole (merge queue)
...
# Conflicts:
# crates/ui-egui/src/tools/analysis_ui.rs
2026-11-15 15:54:19 +01:00
David Mann
5e7a103582
Merge pull request #13793 from rmsff/fix/contact-sheet-flatten-layer-name-13702
...
Contact Sheet II: a flattened sheet ends as a normal layer named Contact Sheet II
2026-11-15 15:54:09 +01:00
David Mann
4c27eef036
Merge pull request #14982 from hectorviov/fix/info-ruler-readout
...
Info panel: the Ruler's A and L (A, L1, L2 for a protractor), its point and size
2026-11-15 15:51:35 +01:00