From 690cce2c1238e13d712535c3ff0bbae933649829 Mon Sep 17 00:00:00 2001 From: Trevor Brown Date: Fri, 13 Nov 2026 17:50:33 -0500 Subject: [PATCH] File menu: Open Recent comes after Open as Smart Object (#14053) The dynamic Open Recent submenu is now inserted directly after file.openAsSmartObject instead of file.openAs (the old anchor stays as the fallback). Its entries, ids, shortcuts and enabled state are unchanged. Co-Authored-By: Claude Sonnet 5.5 Model-Effort: Opus 5.5 drove; Opus 5.5 briefed; Sonnet 5.5 wrote at medium --- crates/ui-egui/src/menus.rs | 3 + crates/ui-egui/src/menus/items.rs | 2 +- .../src/menus/open_recent_position_tests.rs | 56 +++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 crates/ui-egui/src/menus/open_recent_position_tests.rs diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index 71703895d1..ef489dd14d 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -65,6 +65,9 @@ pub(crate) const DOCUMENT_ITEM: &str = "window.document."; #[cfg(test)] mod tests; +#[cfg(test)] +mod open_recent_position_tests; + #[cfg(test)] mod open_recent_tests { use super::*; diff --git a/crates/ui-egui/src/menus/items.rs b/crates/ui-egui/src/menus/items.rs index 4c36419c90..09fcd6f803 100644 --- a/crates/ui-egui/src/menus/items.rs +++ b/crates/ui-egui/src/menus/items.rs @@ -137,7 +137,7 @@ pub fn menu_items(app: &PhotocraftApp) -> Vec { item.label = reveal_label().into(); } // File › Open Recent: a dynamic submenu of recently opened files (inserted after "Open As…"). - if let Some(after) = items.iter().position(|i| i.id == "file.openAs") { + if let Some(after) = items.iter().position(|i| i.id == "file.openAsSmartObject").or_else(|| items.iter().position(|i| i.id == "file.openAs")) { let rp: Vec = vec!["File".into(), "Open Recent".into()]; let mut recent: Vec = app .ui diff --git a/crates/ui-egui/src/menus/open_recent_position_tests.rs b/crates/ui-egui/src/menus/open_recent_position_tests.rs new file mode 100644 index 0000000000..4caa96da95 --- /dev/null +++ b/crates/ui-egui/src/menus/open_recent_position_tests.rs @@ -0,0 +1,56 @@ +//! File menu: Open Recent comes directly after Open as Smart Object (#14053). + +use super::*; + +fn app_with(recent: &[&str]) -> PhotocraftApp { + let mut app = PhotocraftApp::new(photocraft_engine::Session::new(), crate::Services::default()); + app.ui.recent_files = recent.iter().map(|s| (*s).to_string()).collect(); + app +} + +#[test] +fn open_recent_follows_open_as_smart_object() { + let app = app_with(&["/tmp/a.png"]); + let items = menu_items(&app); + let mut flat: Vec = Vec::new(); + let mut seen_recent = false; + for item in items.iter().filter(|i| i.path.first().map(String::as_str) == Some("File")) { + if item.path.len() == 2 && item.path[1] == "Open Recent" { + if !seen_recent { + flat.push("Open Recent".to_string()); + seen_recent = true; + } + } else if item.path.len() == 1 { + flat.push(item.id.clone()); + } + if flat.len() >= 8 { + break; + } + } + assert_eq!( + flat, + vec!["file.new", "file.newFromClipboard", "file.open", "file.openAs", "file.openAsSmartObject", "Open Recent", "file.openExrParts", "---"] + ); +} + +#[test] +fn open_recent_entries_are_unchanged() { + let rp = vec!["File".to_string(), "Open Recent".to_string()]; + for (recent, expect) in [ + (vec![], vec![("file.clearRecent", "Clear Recent File List", false)]), + ( + vec!["/tmp/a.png", "/dir/b.psd"], + vec![ + ("file.openRecent.0", "a.png", true), + ("file.openRecent.1", "b.psd", true), + ("---", "---", false), + ("file.clearRecent", "Clear Recent File List", true), + ], + ), + ] { + let app = app_with(&recent); + let got: Vec<(String, String, bool)> = menu_items(&app).into_iter().filter(|i| i.path == rp).map(|i| (i.id, i.label, i.enabled)).collect(); + let want: Vec<(String, String, bool)> = expect.into_iter().map(|(a, b, c)| (a.to_string(), b.to_string(), c)).collect(); + assert_eq!(got, want); + } +}