Skip to content

Commit

Permalink
Merge pull request #26 from atom/app-restore
Browse files Browse the repository at this point in the history
Restore window on activate event
  • Loading branch information
Jessica Lord committed Jan 5, 2016
2 parents 81158b3 + d709bb0 commit d74d4fc
Showing 1 changed file with 27 additions and 14 deletions.
41 changes: 27 additions & 14 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
'use strict';

const electron = require('electron');
const app = electron.app; // Module to control application life.
const BrowserWindow = electron.BrowserWindow; // Module to create native browser window.
// Module to control application life.
const app = electron.app;
// Module to create native browser window.
const BrowserWindow = electron.BrowserWindow;

// 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 mainWindow;

// 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();
}
});

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on('ready', function() {
function createWindow () {
// Create the browser window.
mainWindow = new BrowserWindow({width: 800, height: 600});

Expand All @@ -35,4 +27,25 @@ app.on('ready', function() {
// when you should delete the corresponding element.
mainWindow = null;
});
}

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
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();
}
});

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 (mainWindow === null) {
createWindow();
}
});

0 comments on commit d74d4fc

Please sign in to comment.