Top menu fix: disable items on other windows

- Sort
- Command palette
- Future-proofing: make sure no more menu items are forgotten in the future

Author: vdavid

apps/desktop/src-tauri/src/commands/CLAUDE.md

@@ -33,6 +33,13 @@ immediately to business-logic modules. No significant logic lives here.
 - **Platform gates.** `volumes` is macOS-only; `mtp` and `network` are macOS+Linux; `volumes_linux` is Linux-only. Individual functions also use `#[cfg]` where behaviour differs (e.g., `sync_status`).
 - **`start_selection_drag`** requires the main thread. It uses `app.run_on_main_thread()` plus a `std::sync::mpsc` channel to return the result synchronously.
 - **`list_shares_with_credentials`** has `#[allow(clippy::too_many_arguments)]` because Tauri command parameters must be top-level arguments — no struct bundling.
+- **`set_menu_context` and Close tab (⌘W).** When the main window loses focus, `set_menu_context("other")` disables all
+  non-App menu items — but `CLOSE_TAB_ID` is explicitly excluded. On macOS, ⌘W means "close the front window," and the
+  `on_menu_event` close-tab exception handles this: if main is focused it closes a tab, otherwise it closes the focused
+  non-main window (Settings, viewer, debug). If `CLOSE_TAB_ID` were disabled, its accelerator wouldn't fire and ⌘W would
+  stop working in non-main windows. This is the only item that needs this exemption — all other non-App items are
+  correctly disabled because they only make sense in the explorer.
+
 ## Dependencies
 
 All major subsystems: `file_system`, `volumes`, `mtp`, `network`, `font_metrics`, `icons`,

apps/desktop/src-tauri/src/commands/ui.rs

@@ -1,5 +1,5 @@
 use crate::ignore_poison::IgnorePoison;
-use crate::menu::{CommandScope, MenuState, build_context_menu, build_tab_context_menu, menu_id_to_command};
+use crate::menu::{CLOSE_TAB_ID, CommandScope, MenuState, build_context_menu, build_tab_context_menu, menu_id_to_command};
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 use std::process::Command;
 use tauri::menu::ContextMenu;
@@ -229,22 +229,28 @@ pub fn update_pin_tab_menu<R: Runtime>(app: AppHandle<R>, is_pinned: bool) -> Re
     item.set_text(label).map_err(|e| e.to_string())
 }
 
-/// Enables or disables file-scoped menu items based on the current context.
+/// Enables or disables explorer-scoped menu items based on the current context.
 /// - `"explorer"`: all menu items enabled (main file explorer has focus)
-/// - `"other"`: file-scoped items disabled (Settings, file viewer, or other window has focus)
+/// - `"other"`: all non-App items disabled except Close tab (⌘W), which doubles as
+///   "close the focused window" — standard macOS behavior
 #[tauri::command]
 pub fn set_menu_context<R: Runtime>(app: AppHandle<R>, context: String) -> Result<(), String> {
     let enabled = context == "explorer";
     let menu_state = app.state::<MenuState<R>>();
-    let items = menu_state.items.lock_ignore_poison();
 
-    for (id, entry) in items.iter() {
-        if let Some((_, CommandScope::FileScoped)) = menu_id_to_command(id) {
+    for (id, entry) in menu_state.items.lock_ignore_poison().iter() {
+        // Close tab stays enabled: on_menu_event has special logic to close the focused
+        // non-main window when main isn't focused (standard ⌘W behavior on macOS).
+        if id == &CLOSE_TAB_ID {
+            continue;
+        }
+        let is_app = matches!(menu_id_to_command(id), Some((_, CommandScope::App)));
+        if !is_app {
             let _ = entry.item.set_enabled(enabled);
         }
     }
 
-    // Items stored in separate MenuState fields (not in the HashMap) also need toggling
+    // Items stored in separate MenuState fields (not in the HashMap)
     if let Some(ref item) = *menu_state.pin_tab.lock_ignore_poison() {
         let _ = item.set_enabled(enabled);
     }
@@ -257,6 +263,9 @@ pub fn set_menu_context<R: Runtime>(app: AppHandle<R>, context: String) -> Resul
     if let Some(ref item) = *menu_state.view_mode_brief.lock_ignore_poison() {
         let _ = item.set_enabled(enabled);
     }
+    if let Some(ref submenu) = *menu_state.sort_submenu.lock_ignore_poison() {
+        let _ = submenu.set_enabled(enabled);
+    }
 
     Ok(())
 }

apps/desktop/src-tauri/src/lib.rs

@@ -290,6 +290,7 @@ pub fn run() {
             *menu_state.view_mode_brief_position.lock_ignore_poison() = menu_items.view_mode_brief_position;
             *menu_state.pin_tab.lock_ignore_poison() = Some(menu_items.pin_tab);
             *menu_state.items.lock_ignore_poison() = menu_items.items;
+            *menu_state.sort_submenu.lock_ignore_poison() = Some(menu_items.sort_submenu);
             app.manage(menu_state);
 
             // Set window title based on license status

apps/desktop/src-tauri/src/menu/mod.rs

@@ -75,7 +75,7 @@ pub fn menu_id_to_command(menu_id: &str) -> Option<(&'static str, CommandScope)>
         ABOUT_ID => Some(("app.about", CommandScope::App)),
         ENTER_LICENSE_KEY_ID => Some(("app.licenseKey", CommandScope::App)),
         SETTINGS_ID => Some(("app.settings", CommandScope::App)),
-        COMMAND_PALETTE_ID => Some(("app.commandPalette", CommandScope::App)),
+        COMMAND_PALETTE_ID => Some(("app.commandPalette", CommandScope::FileScoped)),
 
         // Pane commands (file-scoped)
         SWITCH_PANE_ID => Some(("pane.switch", CommandScope::FileScoped)),
@@ -186,6 +186,8 @@ pub struct MenuState<R: Runtime> {
     pub pin_tab: Mutex<Option<MenuItem<R>>>,
     /// Generic menu items keyed by menu item ID, for accelerator and enable/disable updates.
     pub items: Mutex<HashMap<String, MenuItemEntry<R>>>,
+    /// Sort by submenu (disabled when not in explorer context)
+    pub sort_submenu: Mutex<Option<Submenu<R>>>,
 }
 
 impl<R: Runtime> Default for MenuState<R> {
@@ -200,6 +202,7 @@ impl<R: Runtime> Default for MenuState<R> {
             view_mode_brief_position: Mutex::new(0),
             pin_tab: Mutex::new(None),
             items: Mutex::new(HashMap::new()),
+            sort_submenu: Mutex::new(None),
         }
     }
 }
@@ -220,6 +223,8 @@ pub struct MenuItems<R: Runtime> {
     pub pin_tab: MenuItem<R>,
     /// Generic menu items for accelerator updates, keyed by menu item ID.
     pub items: HashMap<String, MenuItemEntry<R>>,
+    /// Sort by submenu (disabled when not in explorer context)
+    pub sort_submenu: Submenu<R>,
 }
 
 /// View mode type that matches the frontend type.
@@ -720,6 +725,7 @@ fn build_menu_macos<R: Runtime>(
         view_mode_brief_position: view_brief_pos,
         pin_tab: pin_tab_item,
         items,
+        sort_submenu,
     })
 }
 
@@ -991,6 +997,7 @@ fn build_menu_linux<R: Runtime>(
         view_mode_brief_position: view_brief_pos,
         pin_tab: pin_tab_item,
         items,
+        sort_submenu,
     })
 }
 
@@ -1380,14 +1387,15 @@ mod tests {
             menu_id_to_command(SETTINGS_ID),
             Some(("app.settings", CommandScope::App))
         );
-        assert_eq!(
-            menu_id_to_command(COMMAND_PALETTE_ID),
-            Some(("app.commandPalette", CommandScope::App))
-        );
         assert_eq!(
             menu_id_to_command(ENTER_LICENSE_KEY_ID),
             Some(("app.licenseKey", CommandScope::App))
         );
+        // Command palette is FileScoped — disabled when Settings/viewer has focus
+        assert_eq!(
+            menu_id_to_command(COMMAND_PALETTE_ID),
+            Some(("app.commandPalette", CommandScope::FileScoped))
+        );
     }
 
     #[test]
@@ -1504,4 +1512,5 @@ mod tests {
         assert_eq!(command_id_to_menu_id("view.showHidden"), None);
         assert_eq!(command_id_to_menu_id("unknown"), None);
     }
+
 }