From a988ba2512caefd304945ec515cd1f75c96c7cd7 Mon Sep 17 00:00:00 2001 From: Ayaka Neko Date: Thu, 21 Aug 2025 01:25:08 +0800 Subject: [PATCH] fix(stage-tamagotchi): Shift+Alt+R conflicted with report of webview --- .../src/pages/devtools/use-magic-keys.vue | 14 +++++++------- apps/stage-tamagotchi/src/stores/shortcuts.ts | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/stage-tamagotchi/src/pages/devtools/use-magic-keys.vue b/apps/stage-tamagotchi/src/pages/devtools/use-magic-keys.vue index cc8b18bc9..af5b591ab 100644 --- a/apps/stage-tamagotchi/src/pages/devtools/use-magic-keys.vue +++ b/apps/stage-tamagotchi/src/pages/devtools/use-magic-keys.vue @@ -16,9 +16,9 @@ const { s, v_u_e, u_s_e, - Shift_Alt_i, - Shift_Alt_r, - shift_Alt_n, + i_Shift_Alt, + a_Shift_Alt, + n_Shift_Alt, current, } = useMagicKeys({ target: eventTarget }) const keys = computed(() => Array.from(current)) @@ -101,13 +101,13 @@ const Key = defineComponent({
- + Shift + Alt + I - - Shift + Alt + R + + Shift + Alt + A - + Shift + Alt + N
diff --git a/apps/stage-tamagotchi/src/stores/shortcuts.ts b/apps/stage-tamagotchi/src/stores/shortcuts.ts index 6f6379a19..39d39d39f 100644 --- a/apps/stage-tamagotchi/src/stores/shortcuts.ts +++ b/apps/stage-tamagotchi/src/stores/shortcuts.ts @@ -73,7 +73,7 @@ export const useShortcutsStore = defineStore('shortcuts', () => { const shortcuts = ref([ { name: 'tamagotchi.settings.pages.themes.window-shortcuts.toggle-move.label', - shortcut: useVersionedLocalStorage('shortcuts/window/move', 'Shift+Alt+N'), // Shift + Alt + N + shortcut: useVersionedLocalStorage('shortcuts/window/move', 'Shift+Alt+N', { defaultVersion: '1.0.2', satisfiesVersionBy: v => v !== '1.0.2', onVersionMismatch: () => ({ action: 'reset' }) }), // Shift + Alt + N group: 'window', type: 'move', handle: async () => { @@ -83,7 +83,7 @@ export const useShortcutsStore = defineStore('shortcuts', () => { }, { name: 'tamagotchi.settings.pages.themes.window-shortcuts.toggle-resize.label', - shortcut: useVersionedLocalStorage('shortcuts/window/resize', 'Shift+Alt+R'), // Shift + Alt + R + shortcut: useVersionedLocalStorage('shortcuts/window/resize', 'Shift+Alt+A', { defaultVersion: '1.0.2', satisfiesVersionBy: v => v !== '1.0.2', onVersionMismatch: () => ({ action: 'reset' }) }), // Shift + Alt + A group: 'window', type: 'resize', handle: async () => { @@ -93,7 +93,7 @@ export const useShortcutsStore = defineStore('shortcuts', () => { }, { name: 'tamagotchi.settings.pages.themes.window-shortcuts.toggle-ignore-mouse-event.label', - shortcut: useVersionedLocalStorage('shortcuts/window/debug', 'Shift+Alt+I'), // Shift + Alt + I + shortcut: useVersionedLocalStorage('shortcuts/window/debug', 'Shift+Alt+I', { defaultVersion: '1.0.2', satisfiesVersionBy: v => v !== '1.0.2', onVersionMismatch: () => ({ action: 'reset' }) }), // Shift + Alt + I group: 'window', type: 'ignore-mouse-event', handle: async () => {