girineko/YesPlayMusic
1
0
Fork 0
mirror of https://github.com/GiriNeko/YesPlayMusic.git synced 2025-12-16 21:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: hide window when close app (#78)

Browse source 
fix: window can't be close by shortcutkey

fix: tray does not show in Windows
This commit is contained in:
njzy 2020-12-09 19:50:50 +08:00 • committed by GitHub
parent f68ae5c078
commit b394ec0899
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/background.js
View file

@ -17,6 +17,10 @@ const isDevelopment = process.env.NODE_ENV !== "production";
// 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;
// eslint-disable-next-line no-unused-vars
let tray;
let willQuitApp = false;
// ipcMain
initIpcMain(win);
@ -39,7 +43,7 @@ function createWindow() {
win.setMenuBarVisibility(false);
if (process.platform !== "darwin") {
createTray(win);
tray = createTray(win);
}
if (process.env.WEBPACK_DEV_SERVER_URL) {
@ -60,9 +64,19 @@ function createWindow() {
e.preventDefault();
shell.openExternal(url);
});
win.on("closed", () => {
win = null;
win.on("close", (e) => {
if (willQuitApp) {
/* the user tried to quit the app */
win = null;
} else {
/* the user only tried to close the window */
e.preventDefault();
win.hide();
}
});
// win.on("closed", () => {
// win = null;
// });
return win;
}
@ -71,7 +85,7 @@ app.on("window-all-closed", () => {
// On macOS 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.quit();
}
});
@ -80,9 +94,16 @@ app.on("activate", () => {
// dock icon is clicked and there are no other windows open.
if (win === null) {
createWindow();
} else {
win.show();
}
});
/**
* 'before-quit' is emitted when Electron receives the signal to exit and wants to start closing windows
*/
app.on("before-quit", () => (willQuitApp = true));
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.