Hide and force enable isCloseToTray option on macOS

This commit is contained in:
Natsumi
2025-10-27 19:13:46 +11:00
parent 7b9490e110
commit 03509a441b
3 changed files with 14 additions and 5 deletions

View File

@@ -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;
}