docs: update Changelog.md

- persist enable_system_titlebar in verge config and apply it to window decorations
- replace window provider/context with useWindowMaximized hook and inline controls
- add i18n field and tooltip for the setting across locales

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 
   "features": {
     "ghcr.io/devcontainers/features/node:2": {
-      "version": "24.22.0",
+      "version": "24.21.0",
       "pnpmVersion": "12.11.2"
     },
     "ghcr.io/devcontainers/features/rust:1": {

.github/workflows/autobuild.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -185,7 +185,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -282,7 +282,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -426,7 +426,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache
@@ -524,7 +524,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6.1.0
         name: Install pnpm

.github/workflows/cross_check.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/dev.yml

@@ -103,7 +103,7 @@ jobs:
         if: github.event.inputs[matrix.input] == 'true'
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - name: Pnpm Cache

.github/workflows/frontend-check.yml

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-node@v7
         if: steps.check_frontend.outputs.frontend == 'true'
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - name: Restore pnpm cache
@@ -138,7 +138,7 @@ jobs:
       - uses: actions/setup-node@v7
         if: steps.check_inputs.outputs.contract == 'true'
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile

.github/workflows/release.yml

@@ -230,7 +230,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -331,7 +331,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - name: Install pnpm
         uses: pnpm/action-setup@v6
@@ -466,7 +466,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -547,7 +547,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -573,7 +573,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -638,7 +638,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/signpath-test.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - name: Install pnpm
         uses: pnpm/action-setup@v6

.github/workflows/telegram-notify.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.github/workflows/updater.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm
@@ -39,7 +39,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v7
         with:
-          node-version: '24.22.0'
+          node-version: '24.21.0'
 
       - uses: pnpm/action-setup@v6
         name: Install pnpm

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 24.22.0
+nodejs 24.21.0
 pnpm 12.11.2
 rust 1.99.0

Changelog.md

@@ -6,10 +6,6 @@
 - 修复通过 URL 导入订阅时，即使导入的订阅并非当前使用的订阅，也会重新加载当前配置的问题
 - 修复「首页」网站测速失败后卡片一直显示测试中的问题
 
-**🐧 Linux**
-
-- Linux：修复 deb/rpm 安装包错误包含多余的 `frontend-contract` 可执行文件，导致下游重新打包失败的问题
-
 </details>
 
 <details>
@@ -21,6 +17,7 @@
 <details>
 <summary><strong> 🚀 优化改进 </strong></summary>
 
+- 记住「启用系统标题栏」设置，Windows/macOS 即时生效，Linux 重启后生效
 
 **🖥️ Windows**
 

crates/clash-verge-signal/src/lib.rs

@@ -1,15 +1,3 @@
-//! Linux-only termination signal bridge.
-//!
-//! Upstream Tauri delivers session-end and termination events to the app on
-//! Windows and macOS, but has no equivalent on Linux: a desktop session may
-//! end without any window or run event reaching the process. Linux builds
-//! keep this crate to listen for SIGTERM, SIGINT and SIGHUP and forward them
-//! to the app quit flow, so system proxy and TUN cleanup still runs before
-//! the process dies. Non-Linux builds compile this crate to nothing and must
-//! not depend on it.
-
-#![cfg(target_os = "linux")]
-
 use std::sync::{
     OnceLock,
     atomic::{AtomicBool, Ordering},
@@ -17,13 +5,20 @@ use std::sync::{
 
 use clash_verge_logging::{Type, logging};
 
+#[cfg(unix)]
 mod unix;
+#[cfg(windows)]
+mod windows;
 
 pub(crate) static RUNTIME: OnceLock<Option<tokio::runtime::Runtime>> = OnceLock::new();
 pub(crate) static SHUTDOWN_LATCH: ShutdownLatch = ShutdownLatch::new();
 
-/// Serializes signal-triggered cleanups: a signal arriving while a quit
-/// attempt is still in flight is dropped instead of overlapping it.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum ShutdownOutcome {
+    Committed,
+    Canceled,
+}
+
 pub(crate) struct ShutdownLatch {
     is_cleaning_up: AtomicBool,
 }
@@ -41,18 +36,17 @@ impl ShutdownLatch {
             .is_ok()
     }
 
-    fn finish(&self) {
-        self.is_cleaning_up.store(false, Ordering::Release);
+    fn finish(&self, outcome: ShutdownOutcome) {
+        if matches!(outcome, ShutdownOutcome::Canceled) {
+            self.is_cleaning_up.store(false, Ordering::Release);
+        }
     }
 }
 
-/// Spawns the Linux signal loop on a dedicated runtime so it survives the
-/// teardown of any app-owned runtime. The handler runs once per accepted
-/// signal; the quit flow it invokes owns the exit-or-cancel decision.
 pub fn register<F, Fut>(f: F)
 where
     F: Fn() -> Fut + Send + Sync + 'static,
-    Fut: Future<Output = ()> + Send + 'static,
+    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
 {
     RUNTIME.get_or_init(|| match tokio::runtime::Runtime::new() {
         Ok(rt) => Some(rt),
@@ -67,22 +61,36 @@ where
         }
     });
 
+    #[cfg(unix)]
     unix::register(f);
+
+    #[cfg(windows)]
+    windows::register(f);
 }
 
 #[cfg(test)]
 mod tests {
-    use super::ShutdownLatch;
+    use super::{ShutdownLatch, ShutdownOutcome};
 
     #[test]
-    fn finished_attempt_releases_latch_for_the_next_signal() {
+    fn canceled_shutdown_releases_latch_and_permits_next_attempt() {
         let latch = ShutdownLatch::new();
 
         assert!(latch.try_begin());
         assert!(!latch.try_begin());
 
-        latch.finish();
+        latch.finish(ShutdownOutcome::Canceled);
 
         assert!(latch.try_begin());
     }
+
+    #[test]
+    fn committed_shutdown_retains_latch_and_suppresses_repeats() {
+        let latch = ShutdownLatch::new();
+
+        assert!(latch.try_begin());
+        latch.finish(ShutdownOutcome::Committed);
+
+        assert!(!latch.try_begin());
+    }
 }

crates/clash-verge-signal/src/unix.rs

@@ -1,12 +1,12 @@
 use clash_verge_logging::{Type, logging};
 use tokio::signal::unix::{SignalKind, signal};
 
-use crate::{RUNTIME, SHUTDOWN_LATCH};
+use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
 
 pub fn register<F, Fut>(f: F)
 where
     F: Fn() -> Fut + Send + Sync + 'static,
-    Fut: Future<Output = ()> + Send + 'static,
+    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
 {
     if let Some(Some(rt)) = RUNTIME.get() {
         rt.spawn(async move {
@@ -60,8 +60,7 @@ where
                 }
                 logging!(info, Type::SystemSignal, "Caught signal {}", signal_name);
 
-                f().await;
-                SHUTDOWN_LATCH.finish();
+                SHUTDOWN_LATCH.finish(f().await);
             }
         });
     } else {

crates/clash-verge-signal/src/windows.rs

@@ -0,0 +1,83 @@
+use clash_verge_logging::{Type, logging};
+use tokio::signal::windows;
+
+use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
+
+pub fn register<F, Fut>(f: F)
+where
+    F: Fn() -> Fut + Send + Sync + 'static,
+    Fut: Future<Output = ShutdownOutcome> + Send + 'static,
+{
+    if let Some(Some(rt)) = RUNTIME.get() {
+        rt.spawn(async move {
+            let mut ctrl_c = match windows::ctrl_c() {
+                Ok(s) => s,
+                Err(e) => {
+                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+C: {}", e);
+                    return;
+                }
+            };
+
+            let mut ctrl_close = match windows::ctrl_close() {
+                Ok(s) => s,
+                Err(e) => {
+                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Close: {}", e);
+                    return;
+                }
+            };
+
+            let mut ctrl_shutdown = match windows::ctrl_shutdown() {
+                Ok(s) => s,
+                Err(e) => {
+                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Shutdown: {}", e);
+                    return;
+                }
+            };
+
+            let mut ctrl_logoff = match windows::ctrl_logoff() {
+                Ok(s) => s,
+                Err(e) => {
+                    logging!(error, Type::SystemSignal, "Failed to register Ctrl+Logoff: {}", e);
+                    return;
+                }
+            };
+
+            loop {
+                let signal_name;
+                tokio::select! {
+                    _ = ctrl_c.recv() => {
+                        signal_name = "Ctrl+C";
+                    }
+                    _ = ctrl_close.recv() => {
+                        signal_name = "Ctrl+Close";
+                    }
+                    _ = ctrl_shutdown.recv() => {
+                        signal_name = "Ctrl+Shutdown";
+                    }
+                    _ = ctrl_logoff.recv() => {
+                        signal_name = "Ctrl+Logoff";
+                    }
+                }
+
+                if !SHUTDOWN_LATCH.try_begin() {
+                    logging!(
+                        info,
+                        Type::SystemSignal,
+                        "Already shutting down, ignoring repeated signal: {}",
+                        signal_name
+                    );
+                    continue;
+                }
+                logging!(info, Type::SystemSignal, "Caught Windows signal: {}", signal_name);
+
+                SHUTDOWN_LATCH.finish(f().await);
+            }
+        });
+    } else {
+        logging!(
+            error,
+            Type::SystemSignal,
+            "register shutdown signal failed, RUNTIME is not available"
+        );
+    }
+}

scripts/gen-contract.mjs

@@ -22,7 +22,7 @@ try {
       'run',
       '-p',
       'clash-verge',
-      '--example',
+      '--bin',
       'frontend-contract',
       '--locked',
       '-q',

src-tauri/Cargo.toml

@@ -35,6 +35,7 @@ tauri-build = { version = "2.7.1", features = [] }
 clash-verge-draft = { workspace = true }
 clash-verge-media-unlock = { workspace = true }
 clash-verge-logging = { workspace = true }
+clash-verge-signal = { workspace = true }
 clash-verge-i18n = { workspace = true }
 clash-verge-limiter = { workspace = true }
 tauri-plugin-clash-verge-sysinfo = { workspace = true }
@@ -115,10 +116,6 @@ specta-typescript = "=0.0.12"
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.190"
 
-[target.'cfg(target_os = "linux")'.dependencies]
-# Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
-clash-verge-signal = { workspace = true }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 tauri-plugin-wdio-webdriver = { version = "=1.4.0", optional = true }
 objc2 = "0.6.5"

src-tauri/src/bin/frontend-contract.rs

@@ -1,5 +1,3 @@
-// Dev-only target: Tauri ships everything under src/bin/ to /usr/bin in deb/rpm
-// bundles (PR #8131), so this generator must stay an example, never a bin.
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut args = std::env::args_os().skip(1);
     let output = args

src-tauri/src/config/verge.rs

@@ -73,6 +73,9 @@ pub struct IVerge {
 
     pub collapse_navbar: Option<bool>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_system_titlebar: Option<bool>,
+
     pub sysproxy_tray_icon: Option<bool>,
 
     pub tun_tray_icon: Option<bool>,
@@ -374,6 +377,7 @@ impl IVerge {
             menu_icon: Some("monochrome".into()),
             notice_position: Some("top-right".into()),
             collapse_navbar: Some(false),
+            enable_system_titlebar: Some(true),
             common_tray_icon: Some(false),
             sysproxy_tray_icon: Some(false),
             tun_tray_icon: Some(false),
@@ -461,6 +465,7 @@ impl IVerge {
         patch!(proxy_group_tools_position);
         patch!(notice_position);
         patch!(collapse_navbar);
+        patch!(enable_system_titlebar);
         patch!(common_tray_icon);
         patch!(sysproxy_tray_icon);
         patch!(tun_tray_icon);

src-tauri/src/feat/effects.rs

@@ -67,6 +67,7 @@ verge_registry! {
     proxy_group_tools_position => NoEffect;
     notice_position => NoEffect;
     collapse_navbar => NoEffect;
+    enable_system_titlebar => NoEffect;
     sysproxy_tray_icon => [TrayIcon];
     tun_tray_icon => [TrayIcon];
     enable_tun_mode => Tun;

src-tauri/src/feat/window.rs

@@ -130,7 +130,7 @@ pub async fn open_or_close_dashboard() {
     logging!(info, Type::Window, "Window toggle result: {result:?}");
 }
 
-pub async fn quit() {
+pub async fn quit() -> clash_verge_signal::ShutdownOutcome {
     logging!(debug, Type::System, "启动退出流程");
     // 设置退出标志
     handle::Handle::global().set_is_exiting();
@@ -165,11 +165,13 @@ pub async fn quit() {
             NoticeStatus::AppQuitCoreStopFailed,
             cleanup_result.stop_error.unwrap_or_default(),
         );
+        return clash_verge_signal::ShutdownOutcome::Canceled;
     }
 
     utils::server::shutdown_embedded_server();
     let app_handle = handle::Handle::app_handle();
     app_handle.exit(if cleanup_result.all_success { 0 } else { 1 });
+    clash_verge_signal::ShutdownOutcome::Committed
 }
 
 pub async fn clean_async() -> CleanupResult {

src-tauri/src/lib.rs

@@ -116,9 +116,13 @@ mod app_init {
     /// Setup window state management
     pub fn setup_window_state(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
         logging!(debug, Type::Setup, "初始化窗口状态管理...");
+        // Decorations are config-driven (`enable_system_titlebar`); restoring a stale
+        // value here would override the builder's `.decorations(...)` on window recreate.
+        let state_flags =
+            tauri_plugin_window_state::StateFlags::all() & !tauri_plugin_window_state::StateFlags::DECORATIONS;
         let window_state_plugin = tauri_plugin_window_state::Builder::new()
             .with_filename(files::WINDOW_STATE)
-            .with_state_flags(tauri_plugin_window_state::StateFlags::default())
+            .with_state_flags(state_flags)
             .build();
         app.handle().plugin(window_state_plugin)?;
         Ok(())
@@ -230,7 +234,6 @@ pub fn run() -> std::process::ExitCode {
             if let Err(panic) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                 resolve::resolve_setup_async();
                 resolve::resolve_setup_sync();
-                #[cfg(target_os = "linux")]
                 resolve::init_signal();
             })) {
                 log_setup_panic("window-core", panic);

src-tauri/src/main.rs

@@ -16,7 +16,7 @@ fn main() -> ExitCode {
 #[cfg(not(all(feature = "perf-harness", target_os = "macos")))]
 fn main() -> ExitCode {
     let default_parallelism = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
-    let worker_limit = std::cmp::min(default_parallelism, 4);
+    let worker_limit = std::cmp::min(default_parallelism, 8);
     let blocking_limit = 2 * worker_limit;
 
     #[allow(clippy::unwrap_used)]

src-tauri/src/utils/resolve/mod.rs

@@ -20,6 +20,7 @@ use crate::{
     utils::{init, server, window_manager::WindowManager},
 };
 use clash_verge_logging::{Type, logging, logging_error};
+use clash_verge_signal;
 
 #[cfg(target_os = "macos")]
 pub mod dns;
@@ -188,8 +189,6 @@ async fn init_silent_updater() {
     logging!(info, Type::Setup, "Silent updater initialized");
 }
 
-// Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
-#[cfg(target_os = "linux")]
 pub(crate) fn init_signal() {
     logging!(debug, Type::Setup, "Initializing signal handlers...");
     clash_verge_signal::register(feat::quit);

src-tauri/src/utils/resolve/window.rs

@@ -19,11 +19,6 @@ const DEFAULT_HEIGHT: f64 = 700.0;
 const MINIMAL_WIDTH: f64 = 520.0;
 const MINIMAL_HEIGHT: f64 = 520.0;
 
-#[cfg(target_os = "linux")]
-const DEFAULT_DECORATIONS: bool = false;
-#[cfg(not(target_os = "linux"))]
-const DEFAULT_DECORATIONS: bool = true;
-
 const fn restored_window_size_is_too_small(width: u32, height: u32) -> bool {
     width < MINIMAL_WIDTH as u32 || height < MINIMAL_HEIGHT as u32
 }
@@ -49,6 +44,7 @@ pub async fn build_new_window() -> Result<WebviewWindow, String> {
 
     let config = Config::verge().await;
     let latest = config.latest_arc();
+    let decorations = latest.enable_system_titlebar.unwrap_or(true);
     let start_page = latest.start_page.as_deref().unwrap_or("/");
     let initial_theme_mode = match latest.theme_mode.as_deref() {
         Some("dark") => "dark",
@@ -83,7 +79,7 @@ pub async fn build_new_window() -> Result<WebviewWindow, String> {
     )
     .title("Clash Verge")
     .center()
-    .decorations(DEFAULT_DECORATIONS)
+    .decorations(decorations)
     .fullscreen(false)
     .inner_size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
     .min_inner_size(MINIMAL_WIDTH, MINIMAL_HEIGHT)

src-tauri/src/utils/server.rs

@@ -39,6 +39,8 @@ static INSTANCE_LOCK: OnceLock<std::fs::File> = OnceLock::new();
 const PAC_INITIAL_AVAILABLE: bool = false;
 static PAC_AVAILABLE: AtomicBool = AtomicBool::new(PAC_INITIAL_AVAILABLE);
 static COMMANDS_READY: AtomicBool = AtomicBool::new(false);
+#[cfg(feature = "verge-dev")]
+static DEV_QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SingletonDisposition {
@@ -162,12 +164,55 @@ fn instance_auth(token: String) -> impl warp::Filter<Extract = (), Error = warp:
         .untuple_one()
 }
 
+#[cfg(feature = "verge-dev")]
+fn dev_quit_route<F>(
+    token: String,
+    commands_ready: &'static AtomicBool,
+    quit_requested: &'static AtomicBool,
+    trigger: F,
+) -> impl warp::Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
+where
+    F: Fn() + Clone + Send + Sync + 'static,
+{
+    instance_auth(token)
+        .and(warp::path!("commands" / "dev" / "quit"))
+        .and(warp::post())
+        .and_then(move || {
+            let trigger = trigger.clone();
+            async move {
+                if !commands_ready.load(Ordering::Acquire) {
+                    return Ok::<_, warp::Rejection>(warp::reply::with_status(
+                        String::from("starting"),
+                        warp::http::StatusCode::SERVICE_UNAVAILABLE,
+                    ));
+                }
+                if quit_requested
+                    .compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire)
+                    .is_ok()
+                {
+                    trigger();
+                }
+                Ok(warp::reply::with_status(
+                    String::from("accepted"),
+                    warp::http::StatusCode::ACCEPTED,
+                ))
+            }
+        })
+}
+
+#[cfg(feature = "verge-dev")]
+fn release_dev_quit_latch(quit_requested: &AtomicBool, outcome: clash_verge_signal::ShutdownOutcome) {
+    if matches!(outcome, clash_verge_signal::ShutdownOutcome::Canceled) {
+        quit_requested.store(false, Ordering::Release);
+    }
+}
+
 fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
     let (shutdown_tx, shutdown_rx) = oneshot::channel();
     let _ = SHUTDOWN_SENDER.set(Mutex::new(Some(shutdown_tx)));
 
     #[cfg(feature = "verge-dev")]
-    let auth = instance_auth(token);
+    let auth = instance_auth(token.clone());
     #[cfg(not(feature = "verge-dev"))]
     let auth = instance_auth(token);
 
@@ -233,6 +278,12 @@ fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
         });
 
     let commands = auth.clone().and(visible).or(auth.and(scheme)).or(pac);
+    #[cfg(feature = "verge-dev")]
+    let commands = commands.or(dev_quit_route(token, &COMMANDS_READY, &DEV_QUIT_REQUESTED, || {
+        AsyncHandler::spawn(|| async {
+            release_dev_quit_latch(&DEV_QUIT_REQUESTED, crate::feat::quit().await);
+        });
+    }));
     AsyncHandler::spawn(move || async move {
         warp::serve(commands)
             .incoming(listener)

src-tauri/src/utils/tray_speed.rs

@@ -27,12 +27,8 @@ const TRAY_STATUS_ITEM_EXTRA_WIDTH: f64 = 30.0;
 const TRAY_STATUS_ITEM_MIN_LENGTH: f64 = 58.0;
 const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;
 
-/// (button_height, mono_advance, attributes).
-type CachedAttrs = (f64, f64, Retained<NSDictionary<NSString, AnyObject>>);
-
 thread_local! {
     static LAST_DISPLAY_STR: RefCell<String> = const { RefCell::new(String::new()) };
-    static CACHED_ATTRS: RefCell<Option<CachedAttrs>> = const { RefCell::new(None) };
 }
 
 fn format_tray_speed(up: u64, down: u64) -> String {
@@ -78,26 +74,8 @@ fn create_attributed_string(
     }
 }
 
-/// Attributes and per-glyph advance, rebuilt only when the button height changes.
-fn cached_attributes(button_height: f64) -> (f64, Retained<NSDictionary<NSString, AnyObject>>) {
-    CACHED_ATTRS.with(|cache| {
-        if let Some((height, advance, attrs)) = cache.borrow().as_ref()
-            && *height == button_height
-        {
-            return (*advance, attrs.clone());
-        }
-        let attrs = build_attributes(button_height);
-        let probe = NSString::from_str("0");
-        let advance = create_attributed_string(&probe, Some(&attrs)).size().width;
-        *cache.borrow_mut() = Some((button_height, advance, attrs.clone()));
-        (advance, attrs)
-    })
-}
-
-/// Longest line times the monospaced advance; matches `size().width` for the ASCII-only speed text.
-fn arithmetic_width(text: &str, advance: f64) -> f64 {
-    let glyphs = text.split('\n').map(str::len).max().unwrap_or(0) as f64;
-    glyphs * advance
+fn status_item_length_for_speed(attr_str: &NSAttributedString) -> f64 {
+    (attr_str.size().width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH)
 }
 
 fn sync_click_target_frame(button: &NSStatusBarButton) {
@@ -111,7 +89,7 @@ fn sync_click_target_frame(button: &NSStatusBarButton) {
 }
 
 /// `with_inner_tray_icon` should run this on the main thread; fail safely if it does not.
-fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &str, show_speed: bool) {
+fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &NSString, show_speed: bool) {
     let Some(mtm) = MainThreadMarker::new() else {
         logging!(warn, Type::Tray, "托盘速率富文本设置跳过：非主线程调用");
         return;
@@ -119,19 +97,17 @@ fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &str, sh
     let Some(button) = status_item.button(mtm) else {
         return;
     };
-    let ns_string = NSString::from_str(text);
     let attr_str = if show_speed {
-        let (advance, attrs) = cached_attributes(button.bounds().size.height);
+        let attrs = build_attributes(button.bounds().size.height);
         let attrs: &NSDictionary<NSString, AnyObject> = &attrs;
-        let attr_str = create_attributed_string(&ns_string, Some(attrs));
-        let width = arithmetic_width(text, advance);
-        let length = (width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH);
+        let attr_str = create_attributed_string(text, Some(attrs));
+        let length = status_item_length_for_speed(&attr_str);
         if status_item.length() != length {
             status_item.setLength(length);
         }
         attr_str
     } else {
-        create_attributed_string(&ns_string, None)
+        create_attributed_string(text, None)
     };
     button.setAttributedTitle(&attr_str);
     sync_click_target_frame(&button);
@@ -145,7 +121,8 @@ pub fn set_speed_attributed_title(status_item: &NSStatusItem, up: u64, down: u64
             return;
         }
         *last = speed_text;
-        apply_status_item_attributed_title(status_item, last.as_str(), true);
+        let ns_string = NSString::from_str(last.as_str());
+        apply_status_item_attributed_title(status_item, &ns_string, true);
     });
 }
 
@@ -153,6 +130,7 @@ pub fn clear_speed_attributed_title(status_item: &NSStatusItem) {
     LAST_DISPLAY_STR.with(|last| {
         last.borrow_mut().clear();
     });
+    let empty = NSString::from_str("");
     status_item.setLength(NS_VARIABLE_STATUS_ITEM_LENGTH);
-    apply_status_item_attributed_title(status_item, "", false);
+    apply_status_item_attributed_title(status_item, &empty, false);
 }

src/assets/styles/layout.scss

@@ -202,15 +202,9 @@
       width: 100%;
       display: flex;
       justify-content: flex-end;
-      padding: 10px;
       box-sizing: border-box;
       height: 36px;
       border-bottom: 1px solid var(--divider-color);
-
-      &-drag-region {
-        align-self: stretch;
-        flex: 1 1 auto;
-      }
     }
 
     .layout-content__left .the-logo {
@@ -235,16 +229,9 @@
       width: 100%;
       display: flex;
       justify-content: flex-start;
-      padding: 10px;
       box-sizing: border-box;
       height: 36px;
       border-bottom: 1px solid var(--divider-color);
-
-      &-drag-region {
-        align-self: stretch;
-        flex: 1 1 auto;
-        order: 1;
-      }
     }
 
     .layout-content__left {

src/components/layout/window-controller.tsx

@@ -1,13 +1,13 @@
 import { Close, CropSquare, FilterNone, Minimize } from '@mui/icons-material'
 import { Box, IconButton } from '@mui/material'
+import { getCurrentWindow } from '@tauri-apps/api/window'
 import {
-  forwardRef,
+  type MouseEvent,
   type PointerEvent,
   useCallback,
-  useImperativeHandle,
+  useEffect,
 } from 'react'
 
-import { useWindowControls } from '@/hooks/use-window'
 import getSystem from '@/utils/get-system'
 
 const RESIZE_HANDLES = [
@@ -21,9 +21,7 @@ const RESIZE_HANDLES = [
   { direction: 'NorthWest', position: 'north-west' },
 ] as const
 
-export const WindowResizeHandles = () => {
-  const { currentWindow, maximized } = useWindowControls()
-
+export const WindowResizeHandles = ({ maximized }: { maximized: boolean }) => {
   const startResizeDragging = useCallback(
     (event: PointerEvent<HTMLDivElement>) => {
       if (event.button !== 0) return
@@ -33,14 +31,14 @@ export const WindowResizeHandles = () => {
       const handle = RESIZE_HANDLES.find((item) => item.direction === direction)
 
       if (handle) {
-        void currentWindow
+        void getCurrentWindow()
           .startResizeDragging(handle.direction)
           .catch((error) =>
             console.warn('[WindowResizeHandles] 调整窗口大小失败:', error),
           )
       }
     },
-    [currentWindow],
+    [],
   )
 
   if (getSystem() !== 'linux' || maximized) return null
@@ -63,44 +61,77 @@ export const WindowResizeHandles = () => {
   )
 }
 
-export const WindowControls = forwardRef(function WindowControls(props, ref) {
+export const WindowControls = ({
+  maximized,
+  setMaximized,
+}: {
+  maximized: boolean
+  setMaximized: (value: boolean) => void
+}) => {
   const OS = getSystem()
-  const {
-    currentWindow,
-    maximized,
-    minimize,
-    close,
-    toggleFullscreen,
-    toggleMaximize,
-  } = useWindowControls()
 
-  useImperativeHandle(
-    ref,
-    () => ({
-      currentWindow,
-      maximized,
-      minimize,
-      close,
-      toggleFullscreen,
-      toggleMaximize,
-    }),
-    [
-      currentWindow,
-      maximized,
-      minimize,
-      close,
-      toggleFullscreen,
-      toggleMaximize,
-    ],
+  const close = useCallback(async () => {
+    // Delay one frame so the UI can clear :hover before the window hides.
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    await getCurrentWindow().close()
+  }, [])
+
+  const minimize = useCallback(async () => {
+    // Delay one frame so the UI can clear :hover before the window hides.
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    await getCurrentWindow().minimize()
+  }, [])
+
+  const toggleMaximize = useCallback(async () => {
+    const currentWindow = getCurrentWindow()
+    if (await currentWindow.isMaximized()) {
+      await currentWindow.unmaximize()
+      setMaximized(false)
+    } else {
+      await currentWindow.maximize()
+      setMaximized(true)
+    }
+  }, [setMaximized])
+
+  useEffect(() => {
+    getCurrentWindow().setMinimizable(true)
+  }, [])
+
+  const handleTitlebarMouseDown = useCallback(
+    (event: MouseEvent<HTMLDivElement>) => {
+      // Left button only, and only on the first press: detail 2 is the second
+      // press of a double-click, which `handleTitlebarDoubleClick` turns into maximize.
+      if (event.button !== 0 || event.detail !== 1) return
+      // Only the empty bar area drags; the control buttons keep their own clicks.
+      if (event.target !== event.currentTarget) return
+      event.preventDefault()
+      void getCurrentWindow()
+        .startDragging()
+        .catch((error) => console.warn('[WindowControls] 开始拖动失败:', error))
+    },
+    [],
   )
 
-  // 通过前端对 tauri 窗口进行翻转全屏时会短暂地与系统图标重叠渲染。
-  // 这可能是上游缺陷，保险起见跨平台以窗口的最大化翻转为准。
+  const handleTitlebarDoubleClick = useCallback(
+    (event: MouseEvent<HTMLDivElement>) => {
+      if (event.target !== event.currentTarget) return
+      void toggleMaximize().catch((error) =>
+        console.warn('[WindowControls] 切换最大化失败:', error),
+      )
+    },
+    [toggleMaximize],
+  )
 
   return (
     <Box
+      onMouseDown={handleTitlebarMouseDown}
+      onDoubleClick={handleTitlebarDoubleClick}
       sx={{
         display: 'flex',
+        justifyContent: OS === 'macos' ? 'flex-start' : 'flex-end',
+        width: '100%',
+        height: '100%',
+        px: 1,
         gap: 1,
         alignItems: 'center',
         '> button': {
@@ -186,4 +217,4 @@ export const WindowControls = forwardRef(function WindowControls(props, ref) {
       )}
     </Box>
   )
-})
+}

src/components/setting/mods/backup-config-viewer.tsx

@@ -1,11 +1,20 @@
-import { Button, Grid, Stack, TextField } from '@mui/material'
+import Visibility from '@mui/icons-material/Visibility'
+import VisibilityOff from '@mui/icons-material/VisibilityOff'
+import {
+  TextField,
+  Button,
+  Grid,
+  Stack,
+  IconButton,
+  InputAdornment,
+} from '@mui/material'
 import { useLockFn } from 'ahooks'
-import { memo, useEffect, useRef } from 'react'
+import { useState, useRef, memo, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
 import { useVerge } from '@/hooks/use-verge'
-import { createWebdavBackup, saveWebdavConfig } from '@/services/cmds'
+import { saveWebdavConfig, createWebdavBackup } from '@/services/cmds'
 import { mutate } from '@/services/mutate'
 import { errorDetail, showNotice } from '@/services/notice-service'
 import {
@@ -34,6 +43,7 @@ export const BackupConfigViewer = memo(
     const { t } = useTranslation()
     const { verge, mutateVerge } = useVerge()
     const { webdav_url, webdav_username, webdav_password } = verge || {}
+    const [showPassword, setShowPassword] = useState(false)
     const usernameRef = useRef<HTMLInputElement>(null)
     const passwordRef = useRef<HTMLInputElement>(null)
     const urlRef = useRef<HTMLInputElement>(null)
@@ -58,6 +68,10 @@ export const BackupConfigViewer = memo(
     const webdavStatus = getWebdavStatus(webdavSignature)
     const shouldAutoInit = webdavStatus !== 'failed'
 
+    const handleClickShowPassword = () => {
+      setShowPassword((prev) => !prev)
+    }
+
     useEffect(() => {
       if (!webdav_url || !webdav_username || !webdav_password) {
         return
@@ -201,7 +215,7 @@ export const BackupConfigViewer = memo(
               <Grid size={{ xs: 6 }}>
                 <TextField
                   label={t('shared.labels.password')}
-                  type="password"
+                  type={showPassword ? 'text' : 'password'}
                   variant="outlined"
                   size="small"
                   autoCorrect="off"
@@ -209,6 +223,20 @@ export const BackupConfigViewer = memo(
                   spellCheck="false"
                   inputRef={passwordRef}
                   {...register('password')}
+                  slotProps={{
+                    input: {
+                      endAdornment: (
+                        <InputAdornment position="end">
+                          <IconButton
+                            onClick={handleClickShowPassword}
+                            edge="end"
+                          >
+                            {showPassword ? <VisibilityOff /> : <Visibility />}
+                          </IconButton>
+                        </InputAdornment>
+                      ),
+                    },
+                  }}
                 />
               </Grid>
             </Grid>

src/components/setting/mods/layout-viewer.tsx

@@ -12,16 +12,21 @@ import {
 } from '@mui/material'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { join } from '@tauri-apps/api/path'
+import { getCurrentWindow } from '@tauri-apps/api/window'
 import { open as openDialog } from '@tauri-apps/plugin-dialog'
 import { exists } from '@tauri-apps/plugin-fs'
 import { forwardRef, useEffect, useImperativeHandle, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
+import {
+  BaseDialog,
+  type DialogRef,
+  Switch,
+  TooltipIcon,
+} from '@/components/base'
 import { DEFAULT_HOVER_DELAY } from '@/components/proxy/proxy-group-navigator'
 import { useVerge } from '@/hooks/use-verge'
-import { useWindowDecorations } from '@/hooks/use-window'
-import { copyIconFile, getAppDir } from '@/services/cmds'
+import { copyIconFile, getAppDir, restartApp } from '@/services/cmds'
 import { mutate } from '@/services/mutate'
 import { showNotice } from '@/services/notice-service'
 import getSystem from '@/utils/get-system'
@@ -58,8 +63,6 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
   const [sysproxyIcon, setSysproxyIcon] = useState('')
   const [tunIcon, setTunIcon] = useState('')
 
-  const { decorated, toggleDecorations } = useWindowDecorations()
-
   useEffect(() => {
     initIconPath()
   }, [])
@@ -123,17 +126,50 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
       <List>
         <Item>
           <ListItemText
-            primary={t(
-              'settings.components.verge.layout.fields.preferSystemTitlebar',
-            )}
+            primary={
+              <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
+                <span>
+                  {t(
+                    'settings.components.verge.layout.fields.enableSystemTitlebar',
+                  )}
+                </span>
+                <TooltipIcon
+                  title={t(
+                    'settings.components.verge.layout.tooltips.enableSystemTitlebar',
+                  )}
+                  sx={{ opacity: '0.7' }}
+                />
+              </Box>
+            }
           />
           <GuardState
-            value={decorated}
+            value={verge?.enable_system_titlebar ?? true}
             valueProps="checked"
             onCatch={onError}
             onFormat={onSwitchFormat}
-            onChange={async () => {
-              await toggleDecorations()
+            onChange={(e) => onChangeData({ enable_system_titlebar: e })}
+            onGuard={async (e) => {
+              await patchVerge({ enable_system_titlebar: e })
+              if (OS === 'linux') {
+                void mutate(() => restartApp(), {
+                  id: 'restart-app',
+                  errorNotice: false,
+                }).catch((error) => {
+                  console.warn('[LayoutViewer] failed to restart app:', error)
+                })
+              } else {
+                const currentWindow = getCurrentWindow()
+                try {
+                  await currentWindow.setDecorations(e)
+                  // macOS clears the Miniaturizable style bit when decorations are disabled; re-enable minimize.
+                  await currentWindow.setMinimizable(true)
+                } catch (error) {
+                  console.warn(
+                    '[LayoutViewer] failed to apply system titlebar setting:',
+                    error,
+                  )
+                }
+              }
             }}
           >
             <Switch edge="end" />

src/hooks/use-window-maximized.ts

@@ -0,0 +1,41 @@
+import { getCurrentWindow } from '@tauri-apps/api/window'
+import { useEffect, useState } from 'react'
+
+import debounce from '@/utils/debounce'
+
+export const useWindowMaximized = (enabled: boolean) => {
+  const [maximized, setMaximized] = useState(false)
+
+  useEffect(() => {
+    if (!enabled) return
+
+    const currentWindow = getCurrentWindow()
+    let isUnmounted = false
+
+    const syncMaximized = async () => {
+      if (isUnmounted) return
+      try {
+        setMaximized(await currentWindow.isMaximized())
+      } catch (error) {
+        console.warn('[useWindowMaximized] 读取最大化状态失败:', error)
+      }
+    }
+
+    void syncMaximized()
+
+    const unlistenPromise = currentWindow.onResized(
+      debounce(syncMaximized, 300),
+    )
+
+    return () => {
+      isUnmounted = true
+      unlistenPromise
+        .then((unlisten) => unlisten())
+        .catch((err) =>
+          console.warn('[useWindowMaximized] 清理监听器失败:', err),
+        )
+    }
+  }, [enabled])
+
+  return { maximized, setMaximized }
+}

src/hooks/use-window.ts

@@ -1,46 +0,0 @@
-import { use } from 'react'
-
-import { WindowContext, type WindowContextType } from '@/providers/window'
-
-const useWindow = () => {
-  const context = use(WindowContext)
-  if (context === undefined) {
-    throw new Error('useWindow must be used within WindowProvider')
-  }
-  return context
-}
-
-export const useWindowControls = () => {
-  const {
-    maximized,
-    minimize,
-    toggleMaximize,
-    close,
-    toggleFullscreen,
-    currentWindow,
-  } = useWindow()
-  return {
-    maximized,
-    minimize,
-    toggleMaximize,
-    close,
-    toggleFullscreen,
-    currentWindow,
-  } satisfies Pick<
-    WindowContextType,
-    | 'maximized'
-    | 'minimize'
-    | 'toggleMaximize'
-    | 'close'
-    | 'toggleFullscreen'
-    | 'currentWindow'
-  >
-}
-
-export const useWindowDecorations = () => {
-  const { decorated, toggleDecorations, refreshDecorated } = useWindow()
-  return { decorated, toggleDecorations, refreshDecorated } satisfies Pick<
-    WindowContextType,
-    'decorated' | 'toggleDecorations' | 'refreshDecorated'
-  >
-}

src/locales/ar/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "إعدادات التخطيط",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "تفعيل شريط عنوان النظام",
           "trafficGraph": "مخطط حركة المرور",
           "memoryUsage": "استهلاك الذاكرة",
           "proxyGroupIcon": "أيقونة مجموعة الوكلاء",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "إيقاف عرض إحصاءات حركة المرور مؤقتًا عند فقدان التركيز"
         },
         "tooltips": {
+          "enableSystemTitlebar": "استخدام شريط عنوان النظام الأصلي بدلاً من شريط العنوان المخصص المدمج (يلزم إعادة التشغيل على Linux).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/de/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Layout-Einstellungen",
         "fields": {
-          "preferSystemTitlebar": "System-Titelleiste bevorzugen",
+          "enableSystemTitlebar": "System-Titelleiste aktivieren",
           "trafficGraph": "Verkehrsdiagramm",
           "memoryUsage": "Kern-Speichernutzung",
           "proxyGroupIcon": "Proxy-Gruppen-Symbol",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Rendering der Verkehrsstatistiken bei Fokusverlust pausieren"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Die native Titelleiste des Systems anstelle der integrierten benutzerdefinierten Titelleiste verwenden (unter Linux ist ein Neustart erforderlich).",
           "hoverNavigator": "Beim Darüberfahren mit der Maus über die Buchstaben automatisch zur passenden Proxy-Gruppe scrollen",
           "hoverNavigatorDelay": "Wartezeit vor dem automatischen Scrollen beim Darüberfahren, in Millisekunden"
         },

src/locales/en/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Layout Setting",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "Enable System Titlebar",
           "trafficGraph": "Traffic Graph",
           "memoryUsage": "Core Usage",
           "proxyGroupIcon": "Proxy Group Icon",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Pause rendering traffic statistics when blurred"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Use the system's native title bar instead of the built-in custom title bar (restart required on Linux).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/es/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Configuración de la interfaz",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "Activar barra de título del sistema",
           "trafficGraph": "Gráfico de tráfico",
           "memoryUsage": "Uso de memoria del núcleo",
           "proxyGroupIcon": "Icono del grupo de proxy",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Pausar el renderizado de estadísticas de tráfico al perder el foco"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Usar la barra de título nativa del sistema en lugar de la barra de título personalizada integrada (se requiere reiniciar en Linux).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/fa/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "تنظیمات چیدمان",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "فعالسازی نوار عنوان سیستم",
           "trafficGraph": "نمودار ترافیک",
           "memoryUsage": "استفاده از حافظه",
           "proxyGroupIcon": "آیکون گروه پراکسی",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "توقف رندر آمار ترافیک هنگام از دست رفتن فوکوس"
         },
         "tooltips": {
+          "enableSystemTitlebar": "استفاده از نوار عنوان بومی سیستم بهجای نوار عنوان سفارشی داخلی (در لینوکس نیاز به راهاندازی مجدد است).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/id/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Pengaturan Tata Letak",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "Aktifkan bilah judul sistem",
           "trafficGraph": "Grafik Lalu Lintas",
           "memoryUsage": "Penggunaan Memori",
           "proxyGroupIcon": "Ikon Grup Proksi",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Jeda render statistik lalu lintas saat jendela tidak fokus"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Gunakan bilah judul asli sistem sebagai ganti bilah judul kustom bawaan (perlu mulai ulang di Linux).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/jp/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "レイアウト設定",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "システムタイトルバーを有効にする",
           "trafficGraph": "トラフィックグラフ",
           "memoryUsage": "コアメモリ使用量",
           "proxyGroupIcon": "プロキシグループアイコン",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "フォーカスを失ったときにトラフィック統計の描画を一時停止"
         },
         "tooltips": {
+          "enableSystemTitlebar": "内蔵のカスタムタイトルバーの代わりにシステム標準のタイトルバーを使用します（Linux では再起動が必要です）。",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/ko/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "레이아웃 설정",
         "fields": {
-          "preferSystemTitlebar": "시스템 제목 표시줄 사용",
+          "enableSystemTitlebar": "시스템 제목 표시줄 활성화",
           "trafficGraph": "트래픽 그래프",
           "memoryUsage": "메모리 사용량",
           "proxyGroupIcon": "프록시 그룹 아이콘",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "포커스를 잃으면 트래픽 통계 렌더링 일시 중지"
         },
         "tooltips": {
+          "enableSystemTitlebar": "내장 사용자 지정 제목 표시줄 대신 시스템 기본 제목 표시줄을 사용합니다(Linux에서는 다시 시작해야 함).",
           "hoverNavigator": "알파벳에 마우스를 올리면 해당 프록시 그룹으로 자동 스크롤합니다",
           "hoverNavigatorDelay": "호버 시 자동 스크롤까지의 지연(밀리초)"
         },

src/locales/pt/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Configurações de Layout",
         "fields": {
-          "preferSystemTitlebar": "Preferir Barra de Título do Sistema",
+          "enableSystemTitlebar": "Ativar barra de título do sistema",
           "trafficGraph": "Gráfico de Tráfego",
           "memoryUsage": "Uso do Núcleo",
           "proxyGroupIcon": "Ícone do Grupo de Proxy",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Pausar a renderização das estatísticas de tráfego quando sem foco"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Usar a barra de título nativa do sistema em vez da barra de título personalizada integrada (é necessário reiniciar no Linux).",
           "hoverNavigator": "Rola automaticamente até o grupo de proxy correspondente ao passar o mouse sobre as letras do alfabeto",
           "hoverNavigatorDelay": "Atraso antes da rolagem automática ao passar o mouse, em milissegundos"
         },

src/locales/ru/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Настройки раскладки",
         "fields": {
-          "preferSystemTitlebar": "Использовать системную панель заголовка",
+          "enableSystemTitlebar": "Включить системную панель заголовка",
           "trafficGraph": "График трафика",
           "memoryUsage": "Использование памяти",
           "proxyGroupIcon": "Значок группы прокси",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "При потере фокуса приостанавливать отрисовку статистики трафика"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Использовать системную панель заголовка вместо встроенной настраиваемой (в Linux требуется перезапуск).",
           "hoverNavigator": "Автоматически прокручивает к группе прокси при наведении на буквы",
           "hoverNavigatorDelay": "Задержка перед прокруткой при наведении (в миллисекундах)"
         },

src/locales/tr/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Düzen Ayarı",
         "fields": {
-          "preferSystemTitlebar": "Sistem Başlık Çubuğunu Tercih Et",
+          "enableSystemTitlebar": "Sistem başlık çubuğunu etkinleştir",
           "trafficGraph": "Trafik Grafiği",
           "memoryUsage": "Çekirdek Kullanımı",
           "proxyGroupIcon": "Vekil Grup Simgesi",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Odak kaybolduğunda trafik istatistiklerinin işlenmesini duraklat"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Yerleşik özel başlık çubuğu yerine sistemin yerel başlık çubuğunu kullan (Linux'ta yeniden başlatma gerekir).",
           "hoverNavigator": "Alfabe harflerinin üzerine gelindiğinde ilgili vekil grubuna otomatik olarak kaydırır",
           "hoverNavigatorDelay": "Üzerine gelindiğinde otomatik kaydırmadan önceki gecikme, milisaniye cinsinden"
         },

src/locales/tt/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Расположение көйләүләре",
         "fields": {
-          "preferSystemTitlebar": "Prefer System Titlebar",
+          "enableSystemTitlebar": "Enable System Titlebar",
           "trafficGraph": "Трафик графигы",
           "memoryUsage": "Хәтер куллану",
           "proxyGroupIcon": "Прокси төркеме иконкасы",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "Фокус югалганда трафик статистикасын сызуны туктатып тору"
         },
         "tooltips": {
+          "enableSystemTitlebar": "Use the system's native title bar instead of the built-in custom title bar (restart required on Linux).",
           "hoverNavigator": "Automatically scroll to the corresponding proxy group when hovering over alphabet letters",
           "hoverNavigatorDelay": "Delay before auto scrolling when hovering, in milliseconds"
         },

src/locales/zh/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "界面设置",
         "fields": {
-          "preferSystemTitlebar": "优先使用系统标题栏",
+          "enableSystemTitlebar": "启用系统标题栏",
           "trafficGraph": "流量图显",
           "memoryUsage": "内核占用",
           "proxyGroupIcon": "代理组图标",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "失去焦点时暂停渲染流量统计"
         },
         "tooltips": {
+          "enableSystemTitlebar": "使用系统原生标题栏替代内置的自定义标题栏（Linux 下需重启生效）",
           "hoverNavigator": "鼠标悬停在字母上时自动滚动到对应代理组",
           "hoverNavigatorDelay": "鼠标悬停后触发自动跳转前等待的毫秒数"
         },

src/locales/zhtw/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "介面設定",
         "fields": {
-          "preferSystemTitlebar": "優先使用系統標題欄",
+          "enableSystemTitlebar": "啟用系統標題欄",
           "trafficGraph": "流量圖表",
           "memoryUsage": "內核佔用",
           "proxyGroupIcon": "代理組圖示",
@@ -251,6 +251,7 @@
           "pauseRenderTrafficStatsOnBlur": "失去焦點時暫停渲染流量統計"
         },
         "tooltips": {
+          "enableSystemTitlebar": "使用系統原生標題欄取代內建的自訂標題欄（Linux 需重新啟動生效）",
           "hoverNavigator": "滑鼠懸停在字母上時自動捲動到對應代理組",
           "hoverNavigatorDelay": "滑鼠懸停後觸發自動跳轉前等待的毫秒數"
         },

src/main.tsx

@@ -12,7 +12,6 @@ import { BaseErrorBoundary } from './components/base'
 import { router } from './pages/_routers'
 import { preloadHomePageCards } from './pages/home'
 import { AppDataProvider } from './providers/app-data-provider'
-import { WindowProvider } from './providers/window'
 import { FALLBACK_LANGUAGE, initializeLanguage } from './services/i18n'
 import {
   preloadAppData,
@@ -50,11 +49,9 @@ const initializeApp = (initialThemeMode: 'light' | 'dark') => {
       <ComposeContextProvider contexts={contexts}>
         <BaseErrorBoundary>
           <SWRConfig value={swrConfig}>
-            <WindowProvider>
-              <AppDataProvider>
-                <RouterProvider router={router} />
-              </AppDataProvider>
-            </WindowProvider>
+            <AppDataProvider>
+              <RouterProvider router={router} />
+            </AppDataProvider>
           </SWRConfig>
         </BaseErrorBoundary>
       </ComposeContextProvider>

src/pages/_layout.tsx

@@ -1,7 +1,7 @@
 import { Paper, ThemeProvider } from '@mui/material'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useCallback, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Outlet, useNavigate } from 'react-router'
 
@@ -16,7 +16,7 @@ import {
 } from '@/components/layout/window-controller'
 import { useI18n } from '@/hooks/use-i18n'
 import { useVerge } from '@/hooks/use-verge'
-import { useWindowDecorations } from '@/hooks/use-window'
+import { useWindowMaximized } from '@/hooks/use-window-maximized'
 import { useEventBus } from '@/services/bus'
 import { handleNoticeMessage } from '@/services/notice-handlers'
 import { useThemeMode } from '@/services/states'
@@ -46,21 +46,17 @@ const Layout = () => {
   const { switchLanguage } = useI18n()
   const navigate = useNavigate()
   const themeReady = useMemo(() => Boolean(theme), [theme])
-  const windowControlsRef = useRef<any>(null)
-  const { decorated } = useWindowDecorations()
+  const showCustomTitlebar = verge?.enable_system_titlebar === false
+  const { maximized, setMaximized } = useWindowMaximized(showCustomTitlebar)
 
   const customTitlebar = useMemo(
     () =>
-      decorated === false ? (
+      showCustomTitlebar ? (
         <div className="the_titlebar">
-          <div
-            className="the_titlebar-drag-region"
-            data-tauri-drag-region="true"
-          />
-          <WindowControls ref={windowControlsRef} />
+          <WindowControls maximized={maximized} setMaximized={setMaximized} />
         </div>
       ) : null,
-    [decorated],
+    [showCustomTitlebar, maximized, setMaximized],
   )
 
   useLoadingOverlay(themeReady)
@@ -154,9 +150,9 @@ const Layout = () => {
             : {},
         ]}
       >
-        {decorated === false && <WindowResizeHandles />}
+        {showCustomTitlebar && <WindowResizeHandles maximized={maximized} />}
 
-        {/* Custom titlebar - rendered only when decorated is false, memoized for performance */}
+        {/* Custom titlebar - rendered only when the system titlebar is not preferred, memoized for performance */}
         {customTitlebar}
 
         <div className="layout-content">

src/providers/window/index.ts

@@ -1,3 +0,0 @@
-export { WindowContext } from './window-context'
-export type { WindowContextType } from './window-context'
-export { WindowProvider } from './window-provider'

src/providers/window/window-context.ts

@@ -1,18 +0,0 @@
-import { getCurrentWindow } from '@tauri-apps/api/window'
-import { createContext } from 'react'
-
-export interface WindowContextType {
-  decorated: boolean | null
-  maximized: boolean | null
-  toggleDecorations: () => Promise<void>
-  refreshDecorated: () => Promise<boolean>
-  minimize: () => Promise<void>
-  close: () => Promise<void>
-  toggleMaximize: () => Promise<void>
-  toggleFullscreen: () => Promise<void>
-  currentWindow: ReturnType<typeof getCurrentWindow>
-}
-
-export const WindowContext = createContext<WindowContextType | undefined>(
-  undefined,
-)

src/providers/window/window-provider.tsx

@@ -1,111 +0,0 @@
-import { getCurrentWindow } from '@tauri-apps/api/window'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-
-import debounce from '@/utils/debounce'
-
-import { WindowContext } from './window-context'
-
-export const WindowProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
-  const currentWindow = useMemo(() => getCurrentWindow(), [])
-  const [decorated, setDecorated] = useState<boolean | null>(null)
-  const [maximized, setMaximized] = useState<boolean | null>(null)
-
-  const close = useCallback(async () => {
-    // Delay one frame so the UI can clear :hover before the window hides.
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    await currentWindow.close()
-  }, [currentWindow])
-  const minimize = useCallback(async () => {
-    // Delay one frame so the UI can clear :hover before the window hides.
-    await new Promise((resolve) => setTimeout(resolve, 10))
-    await currentWindow.minimize()
-  }, [currentWindow])
-
-  useEffect(() => {
-    let isUnmounted = false
-    let lastWidth = -1
-    let lastHeight = -1
-
-    const checkMaximized = debounce(
-      async (event: { payload: { width: number; height: number } }) => {
-        if (isUnmounted) return
-        const { width, height } = event.payload
-        if (width === lastWidth && height === lastHeight) return
-        lastWidth = width
-        lastHeight = height
-        const value = await currentWindow.isMaximized()
-        setMaximized(value)
-      },
-      300,
-    )
-
-    const unlistenPromise = currentWindow.onResized(checkMaximized)
-
-    return () => {
-      isUnmounted = true
-      unlistenPromise
-        .then((unlisten) => unlisten())
-        .catch((err) => console.warn('[WindowProvider] 清理监听器失败:', err))
-    }
-  }, [currentWindow])
-
-  const toggleMaximize = useCallback(async () => {
-    if (await currentWindow.isMaximized()) {
-      await currentWindow.unmaximize()
-      setMaximized(false)
-    } else {
-      await currentWindow.maximize()
-      setMaximized(true)
-    }
-  }, [currentWindow])
-
-  const toggleFullscreen = useCallback(async () => {
-    await currentWindow.setFullscreen(!(await currentWindow.isFullscreen()))
-  }, [currentWindow])
-
-  const refreshDecorated = useCallback(async () => {
-    const val = await currentWindow.isDecorated()
-    setDecorated(val)
-    return val
-  }, [currentWindow])
-
-  const toggleDecorations = useCallback(async () => {
-    const currentVal = await currentWindow.isDecorated()
-    await currentWindow.setDecorations(!currentVal)
-    setDecorated(!currentVal)
-  }, [currentWindow])
-
-  useEffect(() => {
-    refreshDecorated()
-    currentWindow.setMinimizable?.(true)
-  }, [currentWindow, refreshDecorated])
-
-  const contextValue = useMemo(
-    () => ({
-      decorated,
-      maximized,
-      toggleDecorations,
-      refreshDecorated,
-      minimize,
-      close,
-      toggleMaximize,
-      toggleFullscreen,
-      currentWindow,
-    }),
-    [
-      decorated,
-      maximized,
-      toggleDecorations,
-      refreshDecorated,
-      minimize,
-      close,
-      toggleMaximize,
-      toggleFullscreen,
-      currentWindow,
-    ],
-  )
-
-  return <WindowContext value={contextValue}>{children}</WindowContext>
-}

src/services/bindings.ts

@@ -375,6 +375,7 @@ export type IVerge_Deserialize = {
   proxy_group_tools_position?: string | null
   notice_position?: string | null
   collapse_navbar?: boolean | null
+  enable_system_titlebar?: boolean | null
   sysproxy_tray_icon?: boolean | null
   tun_tray_icon?: boolean | null
   enable_tun_mode?: boolean | null
@@ -465,6 +466,7 @@ export type IVerge_Serialize = {
   proxy_group_tools_position?: string | null
   notice_position?: string | null
   collapse_navbar: boolean | null
+  enable_system_titlebar?: boolean | null
   sysproxy_tray_icon: boolean | null
   tun_tray_icon: boolean | null
   enable_tun_mode: boolean | null

src/types/generated/i18n-keys.ts

@@ -533,7 +533,7 @@ export const translationKeys = [
   'settings.components.verge.theme.actions.editCss',
   'settings.components.verge.theme.dialogs.editCssTitle',
   'settings.components.verge.layout.title',
-  'settings.components.verge.layout.fields.preferSystemTitlebar',
+  'settings.components.verge.layout.fields.enableSystemTitlebar',
   'settings.components.verge.layout.fields.trafficGraph',
   'settings.components.verge.layout.fields.memoryUsage',
   'settings.components.verge.layout.fields.proxyGroupIcon',
@@ -551,6 +551,7 @@ export const translationKeys = [
   'settings.components.verge.layout.fields.enableTrayIcon',
   'settings.components.verge.layout.fields.enableTraySpeed',
   'settings.components.verge.layout.fields.pauseRenderTrafficStatsOnBlur',
+  'settings.components.verge.layout.tooltips.enableSystemTitlebar',
   'settings.components.verge.layout.tooltips.hoverNavigator',
   'settings.components.verge.layout.tooltips.hoverNavigatorDelay',
   'settings.components.verge.layout.options.icon.monochrome',

src/types/generated/i18n-resources.ts

@@ -746,6 +746,7 @@ export interface TranslationResources {
             fields: {
               collapseNavBar: string
               commonTrayIcon: string
+              enableSystemTitlebar: string
               enableTrayIcon: string
               enableTraySpeed: string
               hoverNavigator: string
@@ -753,7 +754,6 @@ export interface TranslationResources {
               memoryUsage: string
               navIcon: string
               pauseRenderTrafficStatsOnBlur: string
-              preferSystemTitlebar: string
               proxyGroupIcon: string
               proxyGroupsDisplayMode: string
               showOutboundModesInline: string
@@ -783,6 +783,7 @@ export interface TranslationResources {
             }
             title: string
             tooltips: {
+              enableSystemTitlebar: string
               hoverNavigator: string
               hoverNavigatorDelay: string
             }

src/utils/get-system.ts

@@ -8,7 +8,7 @@ export default function getSystem() {
 
   if (/win64|win32/i.test(ua) || platform === 'win32') return 'windows'
 
-  if (/linux/i.test(ua)) return 'linux'
+  if (/linux/i.test(ua) || platform === 'linux') return 'linux'
 
   return 'unknown'
 }