Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-08-01 20:12:11 +00:00
Code Issues Projects Releases Wiki Activity

fix closing and restoring not working nicely on darwin

Browse source
This commit is contained in:
Johannes Millan 2017-01-17 01:49:27 +01:00
parent 48d4b55dde
commit 00c5fd1cba
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
electron/main.js
View file

@ -27,10 +27,11 @@ const url = require('url');
// be closed automatically when the JavaScript object is garbage collected.
let mainWindow;
let lastIdleTime;
let darwinForceQuit = false;
function createWindow() {
// Create the browser window.
mainWindow = new BrowserWindow({ width: 800, height: 600 });
mainWindow = new BrowserWindow({width: 800, height: 600});
// and load the index.html of the app.
mainWindow.loadURL(url.format({
@ -49,11 +50,18 @@ function createWindow() {
});
mainWindow.on('close', function (event) {
if (!app.isQuiting) {
event.preventDefault();
mainWindow.hide();
// handle darwin
if (process.platform === 'darwin') {
if (!darwinForceQuit) {
event.preventDefault();
mainWindow.hide();
}
} else {
if (!app.isQuiting) {
event.preventDefault();
mainWindow.hide();
}
}
return false;
});
mainWindow.on('minimize', function (event) {
@ -68,14 +76,6 @@ function createWindow() {
// Some APIs can only be used after this event occurs.
app.on('ready', createWindow);
// Quit when all windows are closed.
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') {
app.quit();
//}
});
let tray = null;
app.on('ready', () => {
@ -124,7 +124,10 @@ app.on('activate', function () {
// dock icon is clicked and there are no other windows open.
if (mainWindow === null) {
createWindow();
} else {
mainWindow.show();
}
});
app.on('ready', () => {
@ -135,6 +138,11 @@ app.on('before-quit', () => {
if (tray) {
tray.destroy();
}
// handle darwin
if (process.platform === 'darwin') {
darwinForceQuit = true;
}
});
// listen to events from frontend