chore(deps): update npm dependencies

tauri-cli's get_binaries() adds every file in src-tauri/src/bin/ as a
bundle binary, and the deb/rpm packagers copy each one to /usr/bin, so
the dev-only bindings generator ended up as /usr/bin/frontend-contract
(1.0 MB) in release packages and broke downstream repackaging (Copr:
"Installed but unpackaged file(s) found"). There is no bundler option
to exclude a binary, so move the generator to an example target, which
cargo keeps dev-only and get_binaries() never scans, and invoke it via
'cargo run --example'.

Ref https://github.com/clash-verge-rev/clash-verge-rev/pull/8131#issuecomment-6137907930

Changelog.md

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

package.json

@@ -54,13 +54,13 @@
     "@mui/icons-material": "^9.4.0",
     "@mui/material": "^9.4.0",
     "@tanstack/react-virtual": "^3.14.13",
-    "@tauri-apps/api": "2.12.1",
-    "@tauri-apps/plugin-clipboard-manager": "2.4.0",
-    "@tauri-apps/plugin-dialog": "2.8.0",
-    "@tauri-apps/plugin-fs": "2.6.0",
-    "@tauri-apps/plugin-http": "2.8.0",
-    "@tauri-apps/plugin-opener": "2.7.0",
-    "@tauri-apps/plugin-updater": "2.13.1",
+    "@tauri-apps/api": "2.12.3",
+    "@tauri-apps/plugin-clipboard-manager": "2.4.2",
+    "@tauri-apps/plugin-dialog": "2.8.2",
+    "@tauri-apps/plugin-fs": "2.7.0",
+    "@tauri-apps/plugin-http": "2.8.2",
+    "@tauri-apps/plugin-opener": "2.7.1",
+    "@tauri-apps/plugin-updater": "2.13.3",
     "ahooks": "^3.10.0",
     "cidr-block": "^2.3.0",
     "compare-versions": "^6.1.1",
@@ -79,7 +79,7 @@
     "react-dom": "19.3.0",
     "react-error-boundary": "6.1.6",
     "react-hook-form": "^7.88.0",
-    "react-i18next": "17.0.15",
+    "react-i18next": "17.0.16",
     "react-markdown": "10.1.0",
     "react-router": "^8.4.0",
     "rehype-raw": "^7.0.0",
@@ -95,7 +95,7 @@
     "@biomejs/biome": "^2.5.14",
     "@eslint-react/eslint-plugin": "^5.20.5",
     "@eslint/js": "^10.0.1",
-    "@tauri-apps/cli": "2.12.1",
+    "@tauri-apps/cli": "2.12.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^24.13.6",
     "@types/react": "19.3.0",
@@ -103,7 +103,7 @@
     "@types/validator": "^13.15.10",
     "@vitejs/plugin-legacy": "^8.2.3",
     "@vitejs/plugin-react": "^6.1.1",
-    "@wdio/tauri-service": "1.4.0",
+    "@wdio/tauri-service": "1.5.0",
     "adm-zip": "^0.6.1",
     "axios": "^1.20.0",
     "cli-color": "^2.0.4",
@@ -123,7 +123,7 @@
     "https-proxy-agent": "^9.1.0",
     "husky": "^9.1.7",
     "jiti": "^2.7.0",
-    "knip": "6.39.0",
+    "knip": "6.41.0",
     "lint-staged": "^17.5.1",
     "sass": "^1.104.1",
     "tar": "^7.5.22",
@@ -133,7 +133,7 @@
     "vite": "^8.3.0",
     "vite-plugin-svgr": "^5.2.0",
     "vitest": "^5.0.1",
-    "webdriverio": "10.0.0",
+    "webdriverio": "10.0.2",
     "ws": "8.22.0"
   },
   "lint-staged": {

scripts/gen-contract.mjs

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

src-tauri/examples/frontend-contract.rs

@@ -1,3 +1,5 @@
+// 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,9 +73,6 @@ 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>,
@@ -377,7 +374,6 @@ 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),
@@ -465,7 +461,6 @@ 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,7 +67,6 @@ 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/lib.rs

@@ -116,13 +116,9 @@ 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(state_flags)
+            .with_state_flags(tauri_plugin_window_state::StateFlags::default())
             .build();
         app.handle().plugin(window_state_plugin)?;
         Ok(())

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

@@ -19,6 +19,11 @@ 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
 }
@@ -44,7 +49,6 @@ 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",
@@ -79,7 +83,7 @@ pub async fn build_new_window() -> Result<WebviewWindow, String> {
     )
     .title("Clash Verge")
     .center()
-    .decorations(decorations)
+    .decorations(DEFAULT_DECORATIONS)
     .fullscreen(false)
     .inner_size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
     .min_inner_size(MINIMAL_WIDTH, MINIMAL_HEIGHT)

src/assets/styles/layout.scss

@@ -202,9 +202,15 @@
       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 {
@@ -229,9 +235,16 @@
       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 {
-  type MouseEvent,
+  forwardRef,
   type PointerEvent,
   useCallback,
-  useEffect,
+  useImperativeHandle,
 } from 'react'
 
+import { useWindowControls } from '@/hooks/use-window'
 import getSystem from '@/utils/get-system'
 
 const RESIZE_HANDLES = [
@@ -21,7 +21,9 @@ const RESIZE_HANDLES = [
   { direction: 'NorthWest', position: 'north-west' },
 ] as const
 
-export const WindowResizeHandles = ({ maximized }: { maximized: boolean }) => {
+export const WindowResizeHandles = () => {
+  const { currentWindow, maximized } = useWindowControls()
+
   const startResizeDragging = useCallback(
     (event: PointerEvent<HTMLDivElement>) => {
       if (event.button !== 0) return
@@ -31,14 +33,14 @@ export const WindowResizeHandles = ({ maximized }: { maximized: boolean }) => {
       const handle = RESIZE_HANDLES.find((item) => item.direction === direction)
 
       if (handle) {
-        void getCurrentWindow()
+        void currentWindow
           .startResizeDragging(handle.direction)
           .catch((error) =>
             console.warn('[WindowResizeHandles] 调整窗口大小失败:', error),
           )
       }
     },
-    [],
+    [currentWindow],
   )
 
   if (getSystem() !== 'linux' || maximized) return null
@@ -61,77 +63,44 @@ export const WindowResizeHandles = ({ maximized }: { maximized: boolean }) => {
   )
 }
 
-export const WindowControls = ({
-  maximized,
-  setMaximized,
-}: {
-  maximized: boolean
-  setMaximized: (value: boolean) => void
-}) => {
+export const WindowControls = forwardRef(function WindowControls(props, ref) {
   const OS = getSystem()
+  const {
+    currentWindow,
+    maximized,
+    minimize,
+    close,
+    toggleFullscreen,
+    toggleMaximize,
+  } = useWindowControls()
 
-  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))
-    },
-    [],
+  useImperativeHandle(
+    ref,
+    () => ({
+      currentWindow,
+      maximized,
+      minimize,
+      close,
+      toggleFullscreen,
+      toggleMaximize,
+    }),
+    [
+      currentWindow,
+      maximized,
+      minimize,
+      close,
+      toggleFullscreen,
+      toggleMaximize,
+    ],
   )
 
-  const handleTitlebarDoubleClick = useCallback(
-    (event: MouseEvent<HTMLDivElement>) => {
-      if (event.target !== event.currentTarget) return
-      void toggleMaximize().catch((error) =>
-        console.warn('[WindowControls] 切换最大化失败:', error),
-      )
-    },
-    [toggleMaximize],
-  )
+  // 通过前端对 tauri 窗口进行翻转全屏时会短暂地与系统图标重叠渲染。
+  // 这可能是上游缺陷，保险起见跨平台以窗口的最大化翻转为准。
 
   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': {
@@ -217,4 +186,4 @@ export const WindowControls = ({
       )}
     </Box>
   )
-}
+})

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

@@ -12,21 +12,16 @@ 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,
-  type DialogRef,
-  Switch,
-  TooltipIcon,
-} from '@/components/base'
+import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
 import { DEFAULT_HOVER_DELAY } from '@/components/proxy/proxy-group-navigator'
 import { useVerge } from '@/hooks/use-verge'
-import { copyIconFile, getAppDir, restartApp } from '@/services/cmds'
+import { useWindowDecorations } from '@/hooks/use-window'
+import { copyIconFile, getAppDir } from '@/services/cmds'
 import { mutate } from '@/services/mutate'
 import { showNotice } from '@/services/notice-service'
 import getSystem from '@/utils/get-system'
@@ -63,6 +58,8 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
   const [sysproxyIcon, setSysproxyIcon] = useState('')
   const [tunIcon, setTunIcon] = useState('')
 
+  const { decorated, toggleDecorations } = useWindowDecorations()
+
   useEffect(() => {
     initIconPath()
   }, [])
@@ -126,50 +123,17 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
       <List>
         <Item>
           <ListItemText
-            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>
-            }
+            primary={t(
+              'settings.components.verge.layout.fields.preferSystemTitlebar',
+            )}
           />
           <GuardState
-            value={verge?.enable_system_titlebar ?? true}
+            value={decorated}
             valueProps="checked"
             onCatch={onError}
             onFormat={onSwitchFormat}
-            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,
-                  )
-                }
-              }
+            onChange={async () => {
+              await toggleDecorations()
             }}
           >
             <Switch edge="end" />

src/hooks/use-window-maximized.ts

@@ -1,41 +0,0 @@
-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

@@ -0,0 +1,46 @@
+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": {
-          "enableSystemTitlebar": "تفعيل شريط عنوان النظام",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "مخطط حركة المرور",
           "memoryUsage": "استهلاك الذاكرة",
           "proxyGroupIcon": "أيقونة مجموعة الوكلاء",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "System-Titelleiste aktivieren",
+          "preferSystemTitlebar": "System-Titelleiste bevorzugen",
           "trafficGraph": "Verkehrsdiagramm",
           "memoryUsage": "Kern-Speichernutzung",
           "proxyGroupIcon": "Proxy-Gruppen-Symbol",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "Enable System Titlebar",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "Traffic Graph",
           "memoryUsage": "Core Usage",
           "proxyGroupIcon": "Proxy Group Icon",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "Activar barra de título del sistema",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "Gráfico de tráfico",
           "memoryUsage": "Uso de memoria del núcleo",
           "proxyGroupIcon": "Icono del grupo de proxy",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "فعالسازی نوار عنوان سیستم",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "نمودار ترافیک",
           "memoryUsage": "استفاده از حافظه",
           "proxyGroupIcon": "آیکون گروه پراکسی",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "Aktifkan bilah judul sistem",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "Grafik Lalu Lintas",
           "memoryUsage": "Penggunaan Memori",
           "proxyGroupIcon": "Ikon Grup Proksi",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "システムタイトルバーを有効にする",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "トラフィックグラフ",
           "memoryUsage": "コアメモリ使用量",
           "proxyGroupIcon": "プロキシグループアイコン",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "시스템 제목 표시줄 활성화",
+          "preferSystemTitlebar": "시스템 제목 표시줄 사용",
           "trafficGraph": "트래픽 그래프",
           "memoryUsage": "메모리 사용량",
           "proxyGroupIcon": "프록시 그룹 아이콘",
@@ -251,7 +251,6 @@
           "pauseRenderTrafficStatsOnBlur": "포커스를 잃으면 트래픽 통계 렌더링 일시 중지"
         },
         "tooltips": {
-          "enableSystemTitlebar": "내장 사용자 지정 제목 표시줄 대신 시스템 기본 제목 표시줄을 사용합니다(Linux에서는 다시 시작해야 함).",
           "hoverNavigator": "알파벳에 마우스를 올리면 해당 프록시 그룹으로 자동 스크롤합니다",
           "hoverNavigatorDelay": "호버 시 자동 스크롤까지의 지연(밀리초)"
         },

src/locales/pt/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Configurações de Layout",
         "fields": {
-          "enableSystemTitlebar": "Ativar barra de título do sistema",
+          "preferSystemTitlebar": "Preferir Barra de Título do Sistema",
           "trafficGraph": "Gráfico de Tráfego",
           "memoryUsage": "Uso do Núcleo",
           "proxyGroupIcon": "Ícone do Grupo de Proxy",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "Включить системную панель заголовка",
+          "preferSystemTitlebar": "Использовать системную панель заголовка",
           "trafficGraph": "График трафика",
           "memoryUsage": "Использование памяти",
           "proxyGroupIcon": "Значок группы прокси",
@@ -251,7 +251,6 @@
           "pauseRenderTrafficStatsOnBlur": "При потере фокуса приостанавливать отрисовку статистики трафика"
         },
         "tooltips": {
-          "enableSystemTitlebar": "Использовать системную панель заголовка вместо встроенной настраиваемой (в Linux требуется перезапуск).",
           "hoverNavigator": "Автоматически прокручивает к группе прокси при наведении на буквы",
           "hoverNavigatorDelay": "Задержка перед прокруткой при наведении (в миллисекундах)"
         },

src/locales/tr/settings.json

@@ -231,7 +231,7 @@
       "layout": {
         "title": "Düzen Ayarı",
         "fields": {
-          "enableSystemTitlebar": "Sistem başlık çubuğunu etkinleştir",
+          "preferSystemTitlebar": "Sistem Başlık Çubuğunu Tercih Et",
           "trafficGraph": "Trafik Grafiği",
           "memoryUsage": "Çekirdek Kullanımı",
           "proxyGroupIcon": "Vekil Grup Simgesi",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "Enable System Titlebar",
+          "preferSystemTitlebar": "Prefer System Titlebar",
           "trafficGraph": "Трафик графигы",
           "memoryUsage": "Хәтер куллану",
           "proxyGroupIcon": "Прокси төркеме иконкасы",
@@ -251,7 +251,6 @@
           "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": {
-          "enableSystemTitlebar": "启用系统标题栏",
+          "preferSystemTitlebar": "优先使用系统标题栏",
           "trafficGraph": "流量图显",
           "memoryUsage": "内核占用",
           "proxyGroupIcon": "代理组图标",
@@ -251,7 +251,6 @@
           "pauseRenderTrafficStatsOnBlur": "失去焦点时暂停渲染流量统计"
         },
         "tooltips": {
-          "enableSystemTitlebar": "使用系统原生标题栏替代内置的自定义标题栏（Linux 下需重启生效）",
           "hoverNavigator": "鼠标悬停在字母上时自动滚动到对应代理组",
           "hoverNavigatorDelay": "鼠标悬停后触发自动跳转前等待的毫秒数"
         },

src/locales/zhtw/settings.json

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

src/main.tsx

@@ -12,6 +12,7 @@ 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,
@@ -49,9 +50,11 @@ const initializeApp = (initialThemeMode: 'light' | 'dark') => {
       <ComposeContextProvider contexts={contexts}>
         <BaseErrorBoundary>
           <SWRConfig value={swrConfig}>
-            <AppDataProvider>
-              <RouterProvider router={router} />
-            </AppDataProvider>
+            <WindowProvider>
+              <AppDataProvider>
+                <RouterProvider router={router} />
+              </AppDataProvider>
+            </WindowProvider>
           </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 } from 'react'
+import { useCallback, useEffect, useMemo, useRef } 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 { useWindowMaximized } from '@/hooks/use-window-maximized'
+import { useWindowDecorations } from '@/hooks/use-window'
 import { useEventBus } from '@/services/bus'
 import { handleNoticeMessage } from '@/services/notice-handlers'
 import { useThemeMode } from '@/services/states'
@@ -46,17 +46,21 @@ const Layout = () => {
   const { switchLanguage } = useI18n()
   const navigate = useNavigate()
   const themeReady = useMemo(() => Boolean(theme), [theme])
-  const showCustomTitlebar = verge?.enable_system_titlebar === false
-  const { maximized, setMaximized } = useWindowMaximized(showCustomTitlebar)
+  const windowControlsRef = useRef<any>(null)
+  const { decorated } = useWindowDecorations()
 
   const customTitlebar = useMemo(
     () =>
-      showCustomTitlebar ? (
+      decorated === false ? (
         <div className="the_titlebar">
-          <WindowControls maximized={maximized} setMaximized={setMaximized} />
+          <div
+            className="the_titlebar-drag-region"
+            data-tauri-drag-region="true"
+          />
+          <WindowControls ref={windowControlsRef} />
         </div>
       ) : null,
-    [showCustomTitlebar, maximized, setMaximized],
+    [decorated],
   )
 
   useLoadingOverlay(themeReady)
@@ -150,9 +154,9 @@ const Layout = () => {
             : {},
         ]}
       >
-        {showCustomTitlebar && <WindowResizeHandles maximized={maximized} />}
+        {decorated === false && <WindowResizeHandles />}
 
-        {/* Custom titlebar - rendered only when the system titlebar is not preferred, memoized for performance */}
+        {/* Custom titlebar - rendered only when decorated is false, memoized for performance */}
         {customTitlebar}
 
         <div className="layout-content">

src/providers/window/index.ts

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

src/providers/window/window-context.ts

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,111 @@
+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,7 +375,6 @@ 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
@@ -466,7 +465,6 @@ 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.enableSystemTitlebar',
+  'settings.components.verge.layout.fields.preferSystemTitlebar',
   'settings.components.verge.layout.fields.trafficGraph',
   'settings.components.verge.layout.fields.memoryUsage',
   'settings.components.verge.layout.fields.proxyGroupIcon',
@@ -551,7 +551,6 @@ 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,7 +746,6 @@ export interface TranslationResources {
             fields: {
               collapseNavBar: string
               commonTrayIcon: string
-              enableSystemTitlebar: string
               enableTrayIcon: string
               enableTraySpeed: string
               hoverNavigator: string
@@ -754,6 +753,7 @@ export interface TranslationResources {
               memoryUsage: string
               navIcon: string
               pauseRenderTrafficStatsOnBlur: string
+              preferSystemTitlebar: string
               proxyGroupIcon: string
               proxyGroupsDisplayMode: string
               showOutboundModesInline: string
@@ -783,7 +783,6 @@ 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) || platform === 'linux') return 'linux'
+  if (/linux/i.test(ua)) return 'linux'
 
   return 'unknown'
 }