Commit 7241d60a authored by h3remi7's avatar h3remi7

fix

parent e5fb639a
const {app, BrowserWindow, shell} = require('electron')
const electron = require('electron')
// Module to control application life.
const app = electron.app
// Module to create native browser window.
const BrowserWindow = electron.BrowserWindow
// this should be placed at top of main.js to handle setup events quickly
if (handleSquirrelEvent()) {
......@@ -70,36 +74,25 @@ function handleSquirrelEvent() {
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
let win
let mainWindow
function createWindow() {
function createWindow () {
// Create the browser window.
win = new BrowserWindow({width: 1000, height: 550, resizable: false, backgroundColor: '#333333', darkTheme: true, acceptFirstMouse: true})
mainWindow = new BrowserWindow({width: 800, height: 600})
// and load the index.html of the app.
win.loadURL(`file://${__dirname}/index.html`)
mainWindow.loadURL(`file://${__dirname}/index.html`)
// Open the DevTools.
win.webContents.openDevTools()
mainWindow.webContents.openDevTools()
win.webContents.on('new-window', function(event, url) {
event.preventDefault();
shell.openExternal(url);
});
win.webContents.on('did-fail-load', function () {
win.loadURL(`file://${__dirname}/index.html`)
})
// Emitted when the window is closed.
win.on('closed', () => {
mainWindow.on('closed', function () {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
win = null
mainWindow = null
})
}
// This method will be called when Electron has finished
......@@ -108,19 +101,22 @@ function createWindow() {
app.on('ready', createWindow)
// Quit when all windows are closed.
app.on('window-all-closed', () => {
// On macOS it is common for applications and their menu bar
app.on('window-all-closed', function () {
// On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
//if (process.platform !== 'darwin') {
if (process.platform !== 'darwin') {
app.quit()
//}
}
})
app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the
app.on('activate', function () {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (win === null) {
if (mainWindow === null) {
createWindow()
}
})
// In this file you can include the rest of your app's specific main process
// code. You can also put them in separate files and require them here.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment