[Fix VC runtime detection] [Remote mount changes]

This commit is contained in:
2019-10-07 16:18:03 -05:00
parent 52cd85ca6f
commit 522626e808
5 changed files with 101 additions and 62 deletions

View File

@@ -34,6 +34,11 @@ const StateIPC = require('../src/renderer/ipc/StateIPC');
const SystemIPC = require('../src/renderer/ipc/SystemIPC');
const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC');
const dimensions = {
height: ((os.platform() === 'darwin') ? 294 : 274) + ((os.platform() === 'win32') ? 30 : -20),
width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160),
};
let isShutdown = false;
let isQuiting = false;
let isInstalling = false;
@@ -77,19 +82,20 @@ const createWindow = () => {
}
// Create the browser window.
const height = (process.env.ELECTRON_START_URL || (os.platform() === 'darwin') ? 294 : 274) + ((os.platform() === 'win32') ? 30 : -20);
mainWindow = new BrowserWindow({
width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160),
height: height,
height: dimensions.height,
width: dimensions.width,
fullscreen: false,
resizable: false,
show: !launchHidden,
title: 'Repertory UI',
...extra,
webPreferences: {
nodeIntegration: true,
webSecurity: !process.env.ELECTRON_START_URL
}
});
mainWindow.removeMenu();
if ((os.platform() === 'darwin') && launchHidden) {
app.dock.hide();
@@ -170,15 +176,15 @@ const createWindow = () => {
mainWindowTray = new Tray(image);
autoLauncher
.isEnabled()
.then((enabled) => {
trayContextMenu.items[1].checked = enabled;
mainWindowTray.setToolTip('Repertory UI');
mainWindowTray.setContextMenu(trayContextMenu)
})
.catch(() => {
closeApplication();
});
.isEnabled()
.then((enabled) => {
trayContextMenu.items[1].checked = enabled;
mainWindowTray.setToolTip('Repertory UI');
mainWindowTray.setContextMenu(trayContextMenu)
})
.catch(() => {
closeApplication();
});
mainWindow.loadURL(startUrl);
};