From 24550340c2eafe62c6dfa0c6fcb8c690364ff063 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 08:28:08 -0800 Subject: [PATCH 1/2] 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. --- crates/ui-egui/src/prefs/prefs_ui/shortcut_set_switch_tests.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/prefs/prefs_ui/shortcut_set_switch_tests.rs b/crates/ui-egui/src/prefs/prefs_ui/shortcut_set_switch_tests.rs index dafa8be560..68a82501d9 100644 --- a/crates/ui-egui/src/prefs/prefs_ui/shortcut_set_switch_tests.rs +++ b/crates/ui-egui/src/prefs/prefs_ui/shortcut_set_switch_tests.rs @@ -165,7 +165,8 @@ fn an_unmodified_set_switches_at_once() { fn an_action_function_key_is_no_edit() { let (mut h, first) = dialog(); h.state_mut().ui.dialogs.retain(|d| d.id != first); - crate::actions::assign_shortcut(h.state_mut(), "Sepia", "F2").unwrap(); + h.state_mut().session.actions.list.push(photocraft_engine::actions_cmds::Action::new("Sepia", Vec::new())); + crate::actions::assign_shortcut(h.state_mut(), 0, "F2").unwrap(); let ctx = h.ctx.clone(); let id = crate::menus::invoke(h.state_mut(), &ctx, "edit.keyboardShortcuts", json!({})).unwrap()["dialog"].as_u64().unwrap(); h.run_steps(4); From f8b8243ce90d443f951614793c9e210db89baf79 Mon Sep 17 00:00:00 2001 From: David Mann Date: Sun, 15 Nov 2026 19:48:25 +0100 Subject: [PATCH 2/2] 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 --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index d3935c94a4..03aadc6d20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5859,8 +5859,8 @@ dependencies = [ name = "photocraft-text" version = "0.23.1" dependencies = [ - "craft-plist", "base64 0.23.1", + "craft-plist", "craft-psd", "flate2", "parley",