feat: dock跟随设置界面

Author: qdaxb

src-tauri/src/lib.rs

@@ -212,6 +212,12 @@ pub fn run() {
                     // 预创建的固定窗口：隐藏保留
                     window.hide().unwrap();
                     api.prevent_close();
+
+                    // macOS：关闭偏好设置窗口时隐藏 dock 图标
+                    #[cfg(target_os = "macos")]
+                    if label == PREFERENCE_WINDOW_LABEL {
+                        let _ = window.app_handle().set_dock_visibility(false);
+                    }
                 }
             }
             _ => {}

src-tauri/src/plugins/window/src/commands/macos.rs

@@ -1,4 +1,7 @@
-use super::{is_main_window, shared_hide_window, shared_show_window, TOAST_WINDOW_LABEL};
+use super::{
+    is_main_window, shared_hide_window, shared_show_window, PREFERENCE_WINDOW_LABEL,
+    TOAST_WINDOW_LABEL,
+};
 use crate::MAIN_WINDOW_LABEL;
 use std::time::Duration;
 use tauri::{command, AppHandle, Manager, PhysicalPosition, Position, Runtime, WebviewWindow};
@@ -10,12 +13,21 @@ pub enum MacOSPanelStatus {
     Resign,
 }
 
+// 是否为偏好设置窗口
+fn is_preference_window<R: Runtime>(window: &WebviewWindow<R>) -> bool {
+    window.label() == PREFERENCE_WINDOW_LABEL
+}
+
 // 显示窗口
 #[command]
 pub async fn show_window<R: Runtime>(app_handle: AppHandle<R>, window: WebviewWindow<R>) {
     if is_main_window(&window) {
         set_macos_panel(&app_handle, &window, MacOSPanelStatus::Show);
     } else {
+        // 显示偏好设置窗口时，同时显示 dock 图标
+        if is_preference_window(&window) {
+            let _ = app_handle.set_dock_visibility(true);
+        }
         shared_show_window(&window);
     }
 }
@@ -27,6 +39,10 @@ pub async fn hide_window<R: Runtime>(app_handle: AppHandle<R>, window: WebviewWi
         set_macos_panel(&app_handle, &window, MacOSPanelStatus::Hide);
     } else {
         shared_hide_window(&window);
+        // 隐藏偏好设置窗口时，同时隐藏 dock 图标
+        if is_preference_window(&window) {
+            let _ = app_handle.set_dock_visibility(false);
+        }
     }
 }
 

src/pages/Main/index.tsx

@@ -22,7 +22,6 @@ import { useTauriListen } from "@/hooks/useTauriListen";
 import { type PasteResult, pasteToClipboard } from "@/plugins/clipboard";
 import {
   applyMainWindowLayout,
-  showTaskbarIcon,
   showToastWindow,
   showWindow,
   toggleWindowVisible,
@@ -116,9 +115,6 @@ const Main = () => {
     },
   });
 
-  // 任务栏图标的显示与隐藏
-  useImmediateKey(globalStore.app, "showTaskbarIcon", showTaskbarIcon);
-
   // 同步配置项
   useTauriListen<Store>(LISTEN_KEY.STORE_CHANGED, ({ payload }) => {
     deepAssign(globalStore, payload.globalStore);

src/pages/Preference/components/General/index.tsx

@@ -56,14 +56,6 @@ const General = () => {
           title={t("preference.settings.app_settings.label.show_menubar_icon")}
           value={app.showMenubarIcon}
         />
-
-        <ProSwitch
-          onChange={(value) => {
-            globalStore.app.showTaskbarIcon = value;
-          }}
-          title={t("preference.settings.app_settings.label.show_taskbar_icon")}
-          value={app.showTaskbarIcon}
-        />
       </ProList>
 
       <ProList header={t("preference.settings.appearance_settings.title")}>