mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: only set backgroundColor in default-app for default index.html (#28792)

Browse source
This commit is contained in:
Milan Burda 2021-04-26 09:29:14 +02:00 • committed by GitHub
parent 7c32deb70f
commit ae0de8ef9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default_app/default_app.ts
View file

@ -41,14 +41,14 @@ ipcMain.handle('bootstrap', (event) => {
return isTrustedSender(event.sender) ? electronPath : null; return isTrustedSender(event.sender) ? electronPath : null;
}); });
async function createWindow () { async function createWindow (backgroundColor?: string) {
await app.whenReady(); await app.whenReady();
const options: Electron.BrowserWindowConstructorOptions = { const options: Electron.BrowserWindowConstructorOptions = {
width: 960, width: 960,
height: 620, height: 620,
autoHideMenuBar: true, autoHideMenuBar: true,
backgroundColor: '#2f3241', backgroundColor,
webPreferences: { webPreferences: {
preload: path.resolve(__dirname, 'preload.js'), preload: path.resolve(__dirname, 'preload.js'),
contextIsolation: true, contextIsolation: true,
@ -95,7 +95,7 @@ export const loadURL = async (appUrl: string) => {
}; };
export const loadFile = async (appPath: string) => { export const loadFile = async (appPath: string) => {
mainWindow = await createWindow(); mainWindow = await createWindow(appPath === 'index.html' ? '#2f3241' : undefined);
mainWindow.loadFile(appPath); mainWindow.loadFile(appPath);
mainWindow.focus(); mainWindow.focus();
}; };