feat: 新增「猫咪设置 > 窗口设置 > 保持在屏幕内」配置项 (#904)

ayangweb · web-flow · commit 48e002146d49 · 2026-04-13T23:49:31.000+08:00
diff --git a/src/composables/useSharedMenu.ts b/src/composables/useSharedMenu.ts
@@ -2,6 +2,7 @@ import { CheckMenuItem, MenuItem, PredefinedMenuItem, Submenu } from '@tauri-app
 import { range } from 'es-toolkit'
 import { useI18n } from 'vue-i18n'
 
+import { WINDOW_LABEL } from '@/constants'
 import { showWindow } from '@/plugins/window'
 import { useCatStore } from '@/stores/cat'
 import { isMac } from '@/utils/platform'
@@ -63,7 +64,7 @@ export function useSharedMenu() {
       MenuItem.new({
         text: t('composables.useSharedMenu.labels.preference'),
         accelerator: isMac ? 'Cmd+,' : '',
-        action: () => showWindow('preference'),
+        action: () => showWindow(WINDOW_LABEL.PREFERENCE),
       }),
       MenuItem.new({
         text: catStore.window.visible ? t('composables.useSharedMenu.labels.hideCat') : t('composables.useSharedMenu.labels.showCat'),
diff --git a/src/composables/useWindowState.ts b/src/composables/useWindowState.ts
@@ -5,9 +5,11 @@ import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
 import { availableMonitors } from '@tauri-apps/api/window'
 import { useDebounceFn } from '@vueuse/core'
 import { isNumber } from 'es-toolkit/compat'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
+import { WINDOW_LABEL } from '@/constants'
 import { useAppStore } from '@/stores/app'
+import { useCatStore } from '@/stores/cat'
 import { getCursorMonitor } from '@/utils/monitor'
 
 export type WindowState = Record<string, Partial<PhysicalPosition & PhysicalSize> | undefined>
@@ -17,6 +19,7 @@ const { label } = appWindow
 
 export function useWindowState() {
   const appStore = useAppStore()
+  const catStore = useCatStore()
   const isRestored = ref(false)
 
   onMounted(() => {
@@ -28,6 +31,8 @@ export function useWindowState() {
   })
 
   const clampToMonitor = useDebounceFn(async () => {
+    if (label !== WINDOW_LABEL.MAIN || !catStore.window.keepInScreen) return
+
     const monitor = await getCursorMonitor()
 
     if (!monitor) return
@@ -49,6 +54,8 @@ export function useWindowState() {
     return appWindow.setPosition(new PhysicalPosition(clampedX, clampedY))
   }, 500)
 
+  watch(() => catStore.window.keepInScreen, clampToMonitor)
+
   const onChange = async (event: Event<PhysicalPosition | PhysicalSize>) => {
     const minimized = await appWindow.isMinimized()
 
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -26,3 +26,8 @@ export const LANGUAGE = {
   VI_VN: 'vi-VN',
   PT_BR: 'pt-BR',
 } as const
+
+export const WINDOW_LABEL = {
+  MAIN: 'main',
+  PREFERENCE: 'preference',
+} as const
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
@@ -17,6 +17,7 @@
           "windowSettings": "Window Settings",
           "passThrough": "Pass Through",
           "alwaysOnTop": "Always on Top",
+          "keepInScreen": "Keep on Screen",
           "windowSize": "Window Size",
           "windowRadius": "Window Radius",
           "opacity": "Opacity",
@@ -31,6 +32,7 @@
           "motionSound": "When enabled, the model will play corresponding sound effects when performing actions (if they exist).",
           "passThrough": "When enabled, clicks pass through the window without affecting it.",
           "alwaysOnTop": "When enabled, the window stays above all other windows.",
+          "keepInScreen": "When enabled, the window automatically stays within the screen boundaries.",
           "windowSize": "Move mouse to window edge, or hold Shift and right-drag to resize.",
           "autoReleaseDelay": "On Windows, some system keys cannot capture release events and will auto-release after timeout.",
           "hideOnHover": "When enabled, the window hides when mouse hovers over it."
diff --git a/src/locales/pt-BR.json b/src/locales/pt-BR.json
@@ -17,6 +17,7 @@
           "windowSettings": "Configurações da Janela",
           "passThrough": "Janela Transparente",
           "alwaysOnTop": "Sempre no Topo",
+          "keepInScreen": "Manter na Tela",
           "windowSize": "Tamanho da Janela",
           "windowRadius": "Raio da Janela",
           "opacity": "Opacidade",
@@ -31,6 +32,7 @@
           "motionSound": "Quando ativado, o modelo reproduzirá efeitos sonoros correspondentes ao executar ações (se existirem).",
           "passThrough": "Quando ativado, a janela não afetará operações em outros aplicativos.",
           "alwaysOnTop": "Quando ativado, a janela sempre ficará acima de outros aplicativos.",
+          "keepInScreen": "Quando ativado, a janela permanece automaticamente dentro dos limites da tela.",
           "windowSize": "Mova o mouse para a borda da janela ou segure Shift e arraste com o botão direito para redimensionar.",
           "autoReleaseDelay": "Devido ao Windows não capturar eventos de liberação de certas teclas de nível do sistema, elas serão automaticamente tratadas como liberadas após um tempo limite.",
           "hideOnHover": "Quando ativado, a janela será ocultada quando o mouse passar sobre ela."
diff --git a/src/locales/vi-VN.json b/src/locales/vi-VN.json
@@ -17,6 +17,7 @@
           "windowSettings": "Cài đặt Cửa sổ",
           "passThrough": "Click xuyên",
           "alwaysOnTop": "Luôn trên cùng",
+          "keepInScreen": "Giữ trong màn hình",
           "windowSize": "Kích thước",
           "windowRadius": "Độ bo tròn cửa sổ",
           "opacity": "Độ mờ",
@@ -31,6 +32,7 @@
           "motionSound": "Khi bật, mô hình sẽ phát các âm thanh tương ứng khi thực hiện hành động (nếu tồn tại).",
           "passThrough": "Bật để cửa sổ không ảnh hưởng đến thao tác trên ứng dụng khác.",
           "alwaysOnTop": "Bật để cửa sổ luôn nằm trên ứng dụng khác.",
+          "keepInScreen": "Khi bật, cửa sổ sẽ tự động giữ trong ranh giới màn hình.",
           "windowSize": "Di chuyển chuột đến mép cửa sổ hoặc giữ Shift và kéo chuột phải để thay đổi kích thước.",
           "autoReleaseDelay": "Do Windows không bắt được sự kiện nhả của một số phím hệ thống, các phím đó sẽ được tự động xem như đã nhả sau khi hết thời gian chờ.",
           "hideOnHover": "Khi bật, cửa sổ sẽ ẩn khi chuột di chuyển vào."
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
@@ -17,6 +17,7 @@
           "windowSettings": "窗口设置",
           "passThrough": "窗口穿透",
           "alwaysOnTop": "窗口置顶",
+          "keepInScreen": "保持在屏幕内",
           "windowSize": "窗口尺寸",
           "windowRadius": "窗口圆角",
           "opacity": "不透明度",
@@ -31,6 +32,7 @@
           "motionSound": "启用后，模型执行动作时会播放对应音效（如果存在）。",
           "passThrough": "启用后，窗口不影响对其他应用程序的操作。",
           "alwaysOnTop": "启用后，窗口始终显示在其他应用程序上方。",
+          "keepInScreen": "启用后，窗口会自动调整位置，防止超出屏幕边界。",
           "windowSize": "将鼠标移至窗口边缘，或按住 Shift 并右键拖动，也可以调整窗口大小。",
           "autoReleaseDelay": "由于 Windows 下部分系统级按键无法捕获释放事件，超时后将自动视为已释放。",
           "hideOnHover": "启用后，鼠标悬停在窗口上时，窗口会隐藏。"
diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json
@@ -17,6 +17,7 @@
           "windowSettings": "視窗設定",
           "passThrough": "視窗穿透",
           "alwaysOnTop": "視窗置頂",
+          "keepInScreen": "保持在螢幕內",
           "windowSize": "視窗尺寸",
           "windowRadius": "視窗圓角",
           "opacity": "不透明度",
@@ -31,6 +32,7 @@
           "motionSound": "啟用後，模型執行動作時會播放對應音效（如果存在）。",
           "passThrough": "啟用後，視窗不影響對其他應用程式的操作。",
           "alwaysOnTop": "啟用後，視窗始終顯示在其他應用程式上方。",
+          "keepInScreen": "啟用後，視窗會自動調整位置，防止超出螢幕邊界。",
           "windowSize": "將滑鼠游標移至視窗邊緣，或按住 Shift 並右鍵拖曳，也可以調整視窗大小。",
           "autoReleaseDelay": "由於 Windows 下部份系統級按鍵無法擷取釋放事件，超時後將自動視為已釋放。",
           "hideOnHover": "啟用後，滑鼠游標懸停在視窗上時，視窗會隱藏。"
diff --git a/src/pages/preference/components/cat/index.vue b/src/pages/preference/components/cat/index.vue
@@ -74,6 +74,13 @@ const catStore = useCatStore()
       <Switch v-model:checked="catStore.window.hideOnHover" />
     </ProListItem>
 
+    <ProListItem
+      :description="$t('pages.preference.cat.hints.keepInScreen')"
+      :title="$t('pages.preference.cat.labels.keepInScreen')"
+    >
+      <Switch v-model:checked="catStore.window.keepInScreen" />
+    </ProListItem>
+
     <ProListItem
       :description="$t('pages.preference.cat.hints.windowSize')"
       :title="$t('pages.preference.cat.labels.windowSize')"
diff --git a/src/pages/preference/components/shortcut/index.vue b/src/pages/preference/components/shortcut/index.vue
@@ -5,6 +5,7 @@ import ProList from '@/components/pro-list/index.vue'
 import ProListItem from '@/components/pro-list-item/index.vue'
 import Shortcut from '@/components/shortcut/index.vue'
 import { useKeyPress } from '@/composables/useKeyPress'
+import { WINDOW_LABEL } from '@/constants'
 import { toggleWindowVisible } from '@/plugins/window'
 import { useCatStore } from '@/stores/cat'
 import { useShortcutStore } from '@/stores/shortcut.ts'
@@ -18,7 +19,7 @@ useKeyPress(visibleCat, () => {
 })
 
 useKeyPress(visiblePreference, () => {
-  toggleWindowVisible('preference')
+  toggleWindowVisible(WINDOW_LABEL.PREFERENCE)
 })
 
 useKeyPress(mirrorMode, () => {
diff --git a/src/plugins/window.ts b/src/plugins/window.ts
@@ -1,10 +1,12 @@
+import type { WINDOW_LABEL } from '../constants'
+
 import { invoke } from '@tauri-apps/api/core'
 import { emit } from '@tauri-apps/api/event'
 import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
 
 import { LISTEN_KEY } from '../constants'
 
-type WindowLabel = 'main' | 'preference'
+export type WindowLabel = typeof WINDOW_LABEL[keyof typeof WINDOW_LABEL]
 
 const COMMAND = {
   SHOW_WINDOW: 'plugin:custom-window|show_window',
diff --git a/src/stores/cat.ts b/src/stores/cat.ts
@@ -17,6 +17,7 @@ export interface CatStore {
     opacity: number
     radius: number
     hideOnHover: boolean
+    keepInScreen: boolean
   }
 }
 
@@ -63,6 +64,7 @@ export const useCatStore = defineStore('cat', () => {
     opacity: 100,
     radius: 0,
     hideOnHover: false,
+    keepInScreen: true,
   })
 
   const init = () => {
