From 3a2f44a448496996fda35e9c7c43423273a82d4e Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Fri, 13 Oct 2023 09:58:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AA=97=E4=BD=93=E5=AE=BD=E9=AB=98=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8F=98=E9=87=8F=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constans/common.ts | 2 ++ src/main/browsers/detach.ts | 3 ++- src/main/browsers/guide.ts | 7 ++++--- src/main/browsers/main.ts | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/constans/common.ts b/src/common/constans/common.ts index 3cc4b40..01bf468 100644 --- a/src/common/constans/common.ts +++ b/src/common/constans/common.ts @@ -1,2 +1,4 @@ export const WINDOW_WIDTH = 688; export const WINDOW_HEIGHT = 60; + +export const WINDOW_MIN_HEIGHT = 60; diff --git a/src/main/browsers/detach.ts b/src/main/browsers/detach.ts index 773e818..4b01e92 100644 --- a/src/main/browsers/detach.ts +++ b/src/main/browsers/detach.ts @@ -1,6 +1,7 @@ import { BrowserWindow, ipcMain, nativeTheme } from 'electron'; import localConfig from '../common/initLocalConfig'; import path from 'path'; +import { WINDOW_MIN_HEIGHT } from '@/common/constans/common'; export default () => { let win: any; @@ -17,7 +18,7 @@ export default () => { const createWindow = async (pluginInfo, viewInfo, view) => { win = new BrowserWindow({ height: viewInfo.height, - minHeight: 60, + minHeight: WINDOW_MIN_HEIGHT, width: viewInfo.width, autoHideMenuBar: true, titleBarStyle: 'hidden', diff --git a/src/main/browsers/guide.ts b/src/main/browsers/guide.ts index 679680d..580a32e 100644 --- a/src/main/browsers/guide.ts +++ b/src/main/browsers/guide.ts @@ -1,5 +1,6 @@ import { BrowserWindow, ipcMain, nativeTheme, screen } from 'electron'; import path from 'path'; +import { WINDOW_HEIGHT, WINDOW_MIN_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; const getWindowPos = (width, height) => { const screenPoint = screen.getCursorScreenPoint(); @@ -39,9 +40,9 @@ export default () => { enableLargerThanScreen: true, x, y, - width: 800, - height: 600, - minHeight: 60, + width: WINDOW_WIDTH, + height: WINDOW_HEIGHT, + minHeight: WINDOW_MIN_HEIGHT, webPreferences: { webSecurity: false, backgroundThrottling: false, diff --git a/src/main/browsers/main.ts b/src/main/browsers/main.ts index 40843ba..8912515 100644 --- a/src/main/browsers/main.ts +++ b/src/main/browsers/main.ts @@ -3,7 +3,7 @@ import path from 'path'; import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'; // import versonHandler from '../common/versionHandler'; import localConfig from '@/main/common/initLocalConfig'; -import { WINDOW_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; +import { WINDOW_HEIGHT, WINDOW_MIN_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; // eslint-disable-next-line @typescript-eslint/no-var-requires require('@electron/remote/main').initialize(); @@ -19,7 +19,7 @@ export default () => { const createWindow = async () => { win = new BrowserWindow({ height: WINDOW_HEIGHT, - minHeight: 60, + minHeight: WINDOW_MIN_HEIGHT, useContentSize: true, resizable: true, width: WINDOW_WIDTH,