diff --git a/src-electron/main.js b/src-electron/main.js index 36da08c2..bdce477b 100644 --- a/src-electron/main.js +++ b/src-electron/main.js @@ -120,7 +120,13 @@ let mainWindow = undefined; const VRCXStorage = interopApi.getDotNetObject('VRCXStorage'); const hasAskedToMoveAppImage = VRCXStorage.Get('VRCX_HasAskedToMoveAppImage') === 'true'; -let isCloseToTray = VRCXStorage.Get('VRCX_CloseToTray') === 'true'; + +function getCloseToTray() { + if (process.platform === 'darwin') { + return true; + } + return VRCXStorage.Get('VRCX_CloseToTray') === 'true'; +} const gotTheLock = app.requestSingleInstanceLock(); const strip_vrcx_prefix_regex = new RegExp('^' + VRCX_URI_PREFIX + '://'); @@ -361,8 +367,7 @@ function createWindow() { mainWindow.webContents.setVisualZoomLevelLimits(1, 5); mainWindow.on('close', (event) => { - isCloseToTray = VRCXStorage.Get('VRCX_CloseToTray') === 'true'; - if (isCloseToTray && !appIsQuitting) { + if (getCloseToTray() && !appIsQuitting) { event.preventDefault(); mainWindow.hide(); } else { @@ -872,7 +877,7 @@ function tryCopyFromWinePrefix() { function applyWindowState() { if (VRCXStorage.Get('VRCX_StartAsMinimizedState') === 'true' && startup) { - if (isCloseToTray) { + if (getCloseToTray()) { mainWindow.hide(); return; } diff --git a/src/stores/settings/general.js b/src/stores/settings/general.js index f46b4908..b28d42ad 100644 --- a/src/stores/settings/general.js +++ b/src/stores/settings/general.js @@ -21,7 +21,7 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => { const isStartAtWindowsStartup = ref(false); const isStartAsMinimizedState = ref(false); const disableGpuAcceleration = ref(false); - const isCloseToTray = ref(process.platform === 'darwin' ? true : false); + const isCloseToTray = ref(false); const disableVrOverlayGpuAcceleration = ref(false); const localFavoriteFriendsGroups = ref([]); const udonExceptionLogging = ref(false); diff --git a/src/views/Settings/components/Tabs/GeneralTab.vue b/src/views/Settings/components/Tabs/GeneralTab.vue index c47ce409..7daea495 100644 --- a/src/views/Settings/components/Tabs/GeneralTab.vue +++ b/src/views/Settings/components/Tabs/GeneralTab.vue @@ -81,6 +81,7 @@ :tooltip="t('view.settings.general.application.startup_linux')" @change="setIsStartAsMinimizedState" /> @@ -364,6 +365,9 @@ const ossDialog = ref(false); const isLinux = computed(() => LINUX); + const isMacOS = computed(() => { + return navigator.platform.indexOf('Mac') > -1; + }); const OpenSourceSoftwareNoticeDialog = defineAsyncComponent( () => import('../../dialogs/OpenSourceSoftwareNoticeDialog.vue')