octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2025-01-09 08:30:15 +00:00
Code Issues Releases Activity

Merge branch 'upstream' into feature/window-state-manager

Browse Source
This commit is contained in:
zweicoder 2016-01-23 15:20:21 +08:00
parent 26ce134de8
commit b6862d0c06
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/components/mainWindow/mainWindow.js
View File

@ -31,6 +31,7 @@ function createMainWindow(options, {quit: onAppQuit, dock}) {
height: mainWindowState.height,
x: mainWindowState.x,
y: mainWindowState.y,
title: options.name,
'web-preferences': {
javascript: true,
plugins: true,
@ -100,17 +101,25 @@ function createMainWindow(options, {quit: onAppQuit, dock}) {
setDockBadge('');
});
mainWindow.on('close', (e) => {
if (isOSX()) {
// this is called when exiting from clicking the cross button on the window
e.preventDefault();
mainWindow.hide();
mainWindow.on('close', event => {
if (mainWindow.isFullScreen()) {
mainWindow.setFullScreen(false);
mainWindow.once('leave-full-screen', maybeHideWindow.bind(this, mainWindow, event));
}
maybeHideWindow(mainWindow, event)
});
mainWindowState.manage(mainWindow);
return mainWindow;
}
function maybeHideWindow(window, event) {
if (isOSX()) {
// this is called when exiting from clicking the cross button on the window
event.preventDefault();
window.hide();
}
// will close the window on other platforms
}
module.exports = createMainWindow;