feat: 新增「通用设置 > 应用设置 > 显示任务栏图标」配置项 (#564)

Author: YiMo1

src-tauri/src/plugins/window/build.rs

@@ -1,4 +1,9 @@
-const COMMANDS: &[&str] = &["show_window", "hide_window", "set_always_on_top"];
+const COMMANDS: &[&str] = &[
+    "show_window",
+    "hide_window",
+    "set_always_on_top",
+    "set_taskbar_visibility",
+];
 
 fn main() {
     tauri_plugin::Builder::new(COMMANDS).build();

src-tauri/src/plugins/window/permissions/default.toml

@@ -2,4 +2,4 @@
 
 [default]
 description = "Default permissions for the plugin"
-permissions = ["allow-show-window", "allow-hide-window", "allow-set-always-on-top"]
+permissions = ["allow-show-window", "allow-hide-window", "allow-set-always-on-top", "allow-set-taskbar-visibility"]

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

@@ -19,3 +19,8 @@ pub async fn set_always_on_top<R: Runtime>(
 ) {
     shared_set_always_on_top(&app_handle, &window, always_on_top);
 }
+
+#[command]
+pub async fn set_taskbar_visibility<R: Runtime>(window: WebviewWindow<R>, visible: bool) {
+    let _ = window.set_skip_taskbar(!visible);
+}

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

@@ -74,3 +74,8 @@ pub fn set_macos_panel<R: Runtime>(
         });
     }
 }
+
+#[command]
+pub async fn set_taskbar_visibility<R: Runtime>(app_handle: AppHandle<R>, visible: bool) {
+    let _ = app_handle.set_dock_visibility(visible);
+}

src-tauri/src/plugins/window/src/lib.rs

@@ -12,7 +12,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
         .invoke_handler(generate_handler![
             commands::show_window,
             commands::hide_window,
-            commands::set_always_on_top
+            commands::set_always_on_top,
+            commands::set_taskbar_visibility,
         ])
         .build()
 }

src/pages/main/index.vue

@@ -13,8 +13,9 @@ import { useDevice } from '@/composables/useDevice'
 import { useModel } from '@/composables/useModel'
 import { useSharedMenu } from '@/composables/useSharedMenu'
 import { INVOKE_KEY } from '@/constants'
-import { hideWindow, setAlwaysOnTop, showWindow } from '@/plugins/window'
+import { hideWindow, setAlwaysOnTop, setTaskbarVisibility, showWindow } from '@/plugins/window'
 import { useCatStore } from '@/stores/cat'
+import { useGeneralStore } from '@/stores/general.ts'
 import { useModelStore } from '@/stores/model'
 import { join } from '@/utils/path'
 
@@ -24,6 +25,7 @@ const { handleDestroy, handleResize, handleMouseDown, handleMouseMove, handleKey
 const catStore = useCatStore()
 const { getSharedMenu } = useSharedMenu()
 const modelStore = useModelStore()
+const generalStore = useGeneralStore()
 const resizing = ref(false)
 const backgroundImagePath = ref<string>()
 
@@ -84,6 +86,8 @@ watch(() => modelStore.currentModel, async (model) => {
   backgroundImagePath.value = existed ? convertFileSrc(path) : void 0
 }, { deep: true, immediate: true })
 
+watch(() => generalStore.taskbarVisibility, setTaskbarVisibility, { immediate: true })
+
 function handleWindowDrag() {
   appWindow.startDragging()
 }

src/pages/preference/components/about/index.vue

@@ -68,7 +68,7 @@ function feedbackIssue() {
     </ProListItem>
 
     <ProListItem
-      description="复制软件信息并提供给 Bug Issue"
+      description="复制软件信息并提供给 Bug Issue。"
       title="软件信息"
     >
       <Button @click="copyInfo">

src/pages/preference/components/cat/index.vue

@@ -15,21 +15,21 @@ function opacityFormatter(value?: number) {
 <template>
   <ProList title="模型设置">
     <ProListItem
-      description="启用后，模型将水平镜像翻转"
+      description="启用后，模型将水平镜像翻转。"
       title="镜像模式"
     >
       <Switch v-model:checked="catStore.mirrorMode" />
     </ProListItem>
 
     <ProListItem
-      description="启用后，每只手只显示最后按下的一个按键"
+      description="启用后，每只手只显示最后按下的一个按键。"
       title="单键模式"
     >
       <Switch v-model:checked="catStore.singleMode" />
     </ProListItem>
 
     <ProListItem
-      description="启用后，鼠标将镜像跟随手部移动"
+      description="启用后，鼠标将镜像跟随手部移动。"
       title="鼠标镜像"
     >
       <Switch v-model:checked="catStore.mouseMirror" />
@@ -38,21 +38,21 @@ function opacityFormatter(value?: number) {
 
   <ProList title="窗口设置">
     <ProListItem
-      description="启用后，窗口不影响对其他应用程序的操作"
+      description="启用后，窗口不影响对其他应用程序的操作。"
       title="窗口穿透"
     >
       <Switch v-model:checked="catStore.penetrable" />
     </ProListItem>
 
     <ProListItem
-      description="启用后，窗口始终显示在其他应用程序上方"
+      description="启用后，窗口始终显示在其他应用程序上方。"
       title="窗口置顶"
     >
       <Switch v-model:checked="catStore.alwaysOnTop" />
     </ProListItem>
 
     <ProListItem
-      description="将鼠标移动到窗口边缘后，也可以拖动调整窗口尺寸"
+      description="将鼠标移动到窗口边缘后，也可以拖动调整窗口尺寸。"
       title="窗口尺寸"
     >
       <InputNumber

src/pages/preference/components/general/index.vue

@@ -31,6 +31,13 @@ watch(() => generalStore.autostart, async (value) => {
     <ProListItem title="开机自启动">
       <Switch v-model:checked="generalStore.autostart" />
     </ProListItem>
+
+    <ProListItem
+      description="启用后，即可通过 OBS Studio 捕获窗口。"
+      title="显示任务栏图标"
+    >
+      <Switch v-model:checked="generalStore.taskbarVisibility" />
+    </ProListItem>
   </ProList>
 
   <ProList title="更新设置">

src/pages/preference/components/shortcut/index.vue

@@ -37,31 +37,31 @@ useTauriKeyPress(alwaysOnTop, () => {
   <ProList title="快捷键">
     <ProShortcut
       v-model="shortcutStore.visibleCat"
-      description="切换猫咪窗口的显示与隐藏"
+      description="切换猫咪窗口的显示与隐藏。"
       title="打开猫咪"
     />
 
     <ProShortcut
       v-model="shortcutStore.visiblePreference"
-      description="切换偏好设置窗口的显示与隐藏"
+      description="切换偏好设置窗口的显示与隐藏。"
       title="打开偏好设置"
     />
 
     <ProShortcut
       v-model="shortcutStore.mirrorMode"
-      description="切换猫咪的镜像模式"
+      description="切换猫咪的镜像模式。"
       title="镜像模式"
     />
 
     <ProShortcut
       v-model="shortcutStore.penetrable"
-      description="切换猫咪窗口是否可穿透"
+      description="切换猫咪窗口是否可穿透。"
       title="窗口穿透"
     />
 
     <ProShortcut
       v-model="shortcutStore.alwaysOnTop"
-      description="切换猫咪窗口是否置顶"
+      description="切换猫咪窗口是否置顶。"
       title="窗口置顶"
     />
   </ProList>