From 8815089c01bf6f30173e39d22717bca2ea0b7d36 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 23 Dec 2024 11:36:15 +0800 Subject: [PATCH] :bug: Fix(custom): fix start mode in mac and win ISSUES CLOSED: #281 --- src/main/lifeCycle/index.ts | 7 +++++-- src/renderer/pages/PicGoSetting.vue | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts index 9f07975..37f1560 100644 --- a/src/main/lifeCycle/index.ts +++ b/src/main/lifeCycle/index.ts @@ -169,7 +169,10 @@ class LifeCycle { db.set(configPaths.settings.isListeningClipboard, false) } const isHideDock = db.get(configPaths.settings.isHideDock) || false - const startMode = db.get(configPaths.settings.startMode) || ISartMode.QUIET + let startMode = db.get(configPaths.settings.startMode) || ISartMode.QUIET + if (process.platform === 'darwin' && startMode === ISartMode.MINI) { + startMode = ISartMode.QUIET + } const currentPicBed = db.get(configPaths.picBed.uploader) || db.get(configPaths.picBed.current) || 'smms' const currentPicBedConfig = db.get(`picBed.${currentPicBed}`)?._configName || 'Default' const tooltip = `${currentPicBed} ${currentPicBedConfig}` @@ -201,7 +204,7 @@ class LifeCycle { } await remoteNoticeHandler.init() remoteNoticeHandler.triggerHook(IRemoteNoticeTriggerHook.APP_START) - if (startMode === ISartMode.MINI) { + if (startMode === ISartMode.MINI && process.platform !== 'darwin') { windowManager.create(IWindowList.MINI_WINDOW) const miniWindow = windowManager.get(IWindowList.MINI_WINDOW)! miniWindow.removeAllListeners() diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index 8ee1da5..56a2936 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -1258,6 +1258,10 @@ async function initData() { formOfSetting.value.autoImportPicBed = initArray(settings.autoImportPicBed || [], []) currentLanguage.value = valueToOptionItem(settings.language || 'zh-CN', languageList) currentStartMode.value = valueToOptionItem(settings.startMode || ISartMode.QUIET, startModeList) + if (osGlobal.value === 'darwin' && currentStartMode.value.value === ISartMode.MINI) { + currentStartMode.value = valueToOptionItem(ISartMode.QUIET, startModeList) + saveConfig(configPaths.settings.startMode, ISartMode.QUIET) + } currentManualPageOpen.value = valueToOptionItem(settings.manualPageOpen || 'window', manualPageOpenList) currentShortUrlServer.value = valueToOptionItem(settings.shortUrlServer || 'c1n', shortUrlServerList) customLink.value = settings.customLink || '![$fileName]($url)'