whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: [ #3221 ] should not enable shortcut of quickAssistant when it's not available (#3228)

Browse Source
This commit is contained in:
fullex 2025-03-18 18:06:08 +08:00 committed by GitHub
parent 99ac5986ee
commit 2d1ab70818
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/services/ShortcutService.ts
View File

@ -128,44 +128,49 @@ export function registerShortcuts(window: BrowserWindow) {
return return
} }
const handler = getShortcutHandler(shortcut) //if not enabled, exit early from the process.
if (!shortcut.enabled) {
return
}
const handler = getShortcutHandler(shortcut)
if (!handler) { if (!handler) {
return return
} }
const accelerator = formatShortcutKey(shortcut.shortcut) switch (shortcut.key) {
case 'show_app':
showAppAccelerator = formatShortcutKey(shortcut.shortcut)
break
if (shortcut.key === 'show_app' && shortcut.enabled) { case 'mini_window':
showAppAccelerator = accelerator //available only when QuickAssistant enabled
if (configManager.getEnableQuickAssistant()) {
showMiniWindowAccelerator = formatShortcutKey(shortcut.shortcut)
}
break
//the following ZOOMs will register shortcuts seperately, so will return
case 'zoom_in':
globalShortcut.register('CommandOrControl+=', () => handler(window))
globalShortcut.register('CommandOrControl+numadd', () => handler(window))
return
case 'zoom_out':
globalShortcut.register('CommandOrControl+-', () => handler(window))
globalShortcut.register('CommandOrControl+numsub', () => handler(window))
return
case 'zoom_reset':
globalShortcut.register('CommandOrControl+0', () => handler(window))
return
} }
if (shortcut.key === 'mini_window' && shortcut.enabled) { const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
showMiniWindowAccelerator = accelerator shortcut.shortcut
} )
if (shortcut.key.includes('zoom')) { globalShortcut.register(accelerator, () => handler(window))
switch (shortcut.key) {
case 'zoom_in':
globalShortcut.register('CommandOrControl+=', () => shortcut.enabled && handler(window))
globalShortcut.register('CommandOrControl+numadd', () => shortcut.enabled && handler(window))
return
case 'zoom_out':
globalShortcut.register('CommandOrControl+-', () => shortcut.enabled && handler(window))
globalShortcut.register('CommandOrControl+numsub', () => shortcut.enabled && handler(window))
return
case 'zoom_reset':
globalShortcut.register('CommandOrControl+0', () => shortcut.enabled && handler(window))
return
}
}
if (shortcut.enabled) {
const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
shortcut.shortcut
)
globalShortcut.register(accelerator, () => handler(window))
}
} catch (error) { } catch (error) {
Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`) Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`)
} }