Merge remote-tracking branch 'origin/1.1.x_branch' into 1.2.x_branch

This commit is contained in:
2020-02-12 15:52:57 -06:00

View File

@@ -42,8 +42,8 @@ const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC');
const platform = os.platform(); const platform = os.platform();
const dimensions = { const dimensions = {
height: ((platform === 'darwin') ? 346 : (platform === 'win32') ? 326 : 300), height: (platform === 'win32') ? 326 : (platform === 'darwin') ? 322 : 300,
width: 428 + ((platform === 'win32') ? 40 : (platform === 'darwin') ? 190 : 200), width: (platform === 'win32') ? 468 : 628,
}; };
let isShutdown = false; let isShutdown = false;
@@ -307,4 +307,4 @@ PlatformIPC.addListeners(ipcMain, detectScript, saveUiSettings);
ReleaseIPC.addListeners(ipcMain, standardIPCReply); ReleaseIPC.addListeners(ipcMain, standardIPCReply);
StateIPC.addListeners(ipcMain); StateIPC.addListeners(ipcMain);
SystemIPC.addListeners(ipcMain, closeApplication); SystemIPC.addListeners(ipcMain, closeApplication);
UpgradeIPC.addListeners(ipcMain, setIsInstalling, MountsIPC.unmountAllDrives, standardIPCReply); UpgradeIPC.addListeners(ipcMain, setIsInstalling, MountsIPC.unmountAllDrives, standardIPCReply);