From bbfc686c33334e0b619ed07f80084293aed3aa4a Mon Sep 17 00:00:00 2001 From: Louis Date: Mon, 11 Mar 2024 23:29:39 +0700 Subject: [PATCH] fix: quick ask not show (#2315) * fix: quick ask not show * fix: window resize does not work on windows 11 --- electron/main.ts | 13 +++++++------ electron/managers/window.ts | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index e72c7f95a..78577ac68 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -68,11 +68,7 @@ app } else { app.on('second-instance', (_event, _commandLine, _workingDirectory) => { // Someone tried to run a second instance, we should focus our window. - if (windowManager.mainWindow) { - if (windowManager.mainWindow.isMinimized()) - windowManager.mainWindow.restore() - windowManager.mainWindow.focus() - } + windowManager.showMainWindow() }) } app.on('activate', () => { @@ -107,7 +103,12 @@ function createMainWindow() { function registerGlobalShortcuts() { const ret = registerShortcut(quickAskHotKey, (selectedText: string) => { - windowManager.showMainWindow() + if (!windowManager.isQuickAskWindowVisible()) { + windowManager.showQuickAskWindow() + windowManager.sendQuickAskSelectedText(selectedText) + } else { + windowManager.hideQuickAskWindow() + } }) if (!ret) { diff --git a/electron/managers/window.ts b/electron/managers/window.ts index 796a5d54a..eed80c37c 100644 --- a/electron/managers/window.ts +++ b/electron/managers/window.ts @@ -101,6 +101,7 @@ class WindowManager { expandQuickAskWindow(heightOffset: number): void { const width = quickAskWindowConfig.width! const height = quickAskWindowConfig.height! + heightOffset + this._quickAskWindow?.setMinimumSize(width, height) this._quickAskWindow?.setSize(width, height, true) }