feat(tray): add optional inline outbound modes in tray menu #5881

Closes #5881

src-tauri/src/config/verge.rs

@@ -230,6 +230,8 @@ pub struct IVerge {
     // pub enable_tray_icon: Option<bool>,
     /// show proxy groups directly on tray root menu
     pub tray_inline_proxy_groups: Option<bool>,
+    /// show outbound modes directly on tray root menu
+    pub tray_inline_outbound_modes: Option<bool>,
 
     /// 自动进入轻量模式
     pub enable_auto_light_weight_mode: Option<bool>,
@@ -440,6 +442,7 @@ impl IVerge {
             enable_tray_speed: Some(false),
             // enable_tray_icon: Some(true),
             tray_inline_proxy_groups: Some(true),
+            tray_inline_outbound_modes: Some(false),
             enable_global_hotkey: Some(true),
             enable_auto_light_weight_mode: Some(false),
             auto_light_weight_minutes: Some(10),
@@ -541,6 +544,7 @@ impl IVerge {
         patch!(enable_tray_speed);
         // patch!(enable_tray_icon);
         patch!(tray_inline_proxy_groups);
+        patch!(tray_inline_outbound_modes);
         patch!(enable_auto_light_weight_mode);
         patch!(auto_light_weight_minutes);
         patch!(enable_dns_settings);

src-tauri/src/core/tray/mod.rs

@@ -771,6 +771,7 @@ async fn create_tray_menu(
 
     let verge_settings = Config::verge().await.latest_arc();
     let show_proxy_groups_inline = verge_settings.tray_inline_proxy_groups.unwrap_or(true);
+    let show_outbound_modes_inline = verge_settings.tray_inline_outbound_modes.unwrap_or(false);
 
     let version = env!("CARGO_PKG_VERSION");
 
@@ -794,13 +795,6 @@ async fn create_tray_menu(
         hotkeys.get("open_or_close_dashboard").map(|s| s.as_str()),
     )?;
 
-    let current_mode_text = match current_proxy_mode {
-        "global" => rust_i18n::t!("tray.global"),
-        "direct" => rust_i18n::t!("tray.direct"),
-        _ => rust_i18n::t!("tray.rule"),
-    };
-    let outbound_modes_label = format!("{} ({})", texts.outbound_modes, current_mode_text);
-
     let rule_mode = &CheckMenuItem::with_id(
         app_handle,
         MenuIds::RULE_MODE,
@@ -828,17 +822,27 @@ async fn create_tray_menu(
         hotkeys.get("clash_mode_direct").map(|s| s.as_str()),
     )?;
 
-    let outbound_modes = &Submenu::with_id_and_items(
-        app_handle,
-        MenuIds::OUTBOUND_MODES,
-        outbound_modes_label.as_str(),
-        true,
-        &[
-            rule_mode as &dyn IsMenuItem<Wry>,
-            global_mode as &dyn IsMenuItem<Wry>,
-            direct_mode as &dyn IsMenuItem<Wry>,
-        ],
-    )?;
+    let outbound_modes = if show_outbound_modes_inline {
+        None
+    } else {
+        let current_mode_text = match current_proxy_mode {
+            "global" => rust_i18n::t!("tray.global"),
+            "direct" => rust_i18n::t!("tray.direct"),
+            _ => rust_i18n::t!("tray.rule"),
+        };
+        let outbound_modes_label = format!("{} ({})", texts.outbound_modes, current_mode_text);
+        Some(Submenu::with_id_and_items(
+            app_handle,
+            MenuIds::OUTBOUND_MODES,
+            outbound_modes_label.as_str(),
+            true,
+            &[
+                rule_mode as &dyn IsMenuItem<Wry>,
+                global_mode as &dyn IsMenuItem<Wry>,
+                direct_mode as &dyn IsMenuItem<Wry>,
+            ],
+        )?)
+    };
 
     let profiles = &Submenu::with_id_and_items(
         app_handle,
@@ -946,7 +950,19 @@ async fn create_tray_menu(
     let separator = &PredefinedMenuItem::separator(app_handle)?;
 
     // 动态构建菜单项
-    let mut menu_items: Vec<&dyn IsMenuItem<Wry>> = vec![open_window, outbound_modes, separator, profiles];
+    let mut menu_items: Vec<&dyn IsMenuItem<Wry>> = vec![open_window, separator];
+
+    if show_outbound_modes_inline {
+        menu_items.extend_from_slice(&[
+            rule_mode as &dyn IsMenuItem<Wry>,
+            global_mode as &dyn IsMenuItem<Wry>,
+            direct_mode as &dyn IsMenuItem<Wry>,
+        ]);
+    } else if let Some(ref outbound_modes) = outbound_modes {
+        menu_items.push(outbound_modes);
+    }
+
+    menu_items.extend_from_slice(&[separator, profiles]);
 
     // 如果有代理节点，添加代理节点菜单
     if show_proxy_groups_inline {

src-tauri/src/feat/config.rs

@@ -103,6 +103,7 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
     let enable_auto_light_weight = patch.enable_auto_light_weight_mode;
     let enable_external_controller = patch.enable_external_controller;
     let tray_inline_proxy_groups = patch.tray_inline_proxy_groups;
+    let tray_inline_outbound_modes = patch.tray_inline_outbound_modes;
     let enable_proxy_guard = patch.enable_proxy_guard;
     let proxy_guard_duration = patch.proxy_guard_duration;
 
@@ -184,6 +185,9 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
     if tray_inline_proxy_groups.is_some() {
         update_flags |= UpdateFlags::SystrayMenu as i32;
     }
+    if tray_inline_outbound_modes.is_some() {
+        update_flags |= UpdateFlags::SystrayMenu as i32;
+    }
 
     update_flags
 }