Replace isHidden with isVisible()
There is an API, BrowserWindow.isVisible().
This commit is contained in:
parent
ad7f63127f
commit
1f0961c94c
14
src/main.js
14
src/main.js
|
@ -160,7 +160,6 @@ app.on('browser-window-created', function(event, window) {
|
||||||
// For OSX, show hidden mainWindow when clicking dock icon.
|
// For OSX, show hidden mainWindow when clicking dock icon.
|
||||||
app.on('activate', function(event) {
|
app.on('activate', function(event) {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
mainWindow.isHidden = false;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
app.on('before-quit', function() {
|
app.on('before-quit', function() {
|
||||||
|
@ -233,9 +232,8 @@ app.on('ready', function() {
|
||||||
trayIcon.setToolTip(app.getName());
|
trayIcon.setToolTip(app.getName());
|
||||||
trayIcon.on('click', function() {
|
trayIcon.on('click', function() {
|
||||||
if (process.platform === 'win32' || process.platform === 'linux') {
|
if (process.platform === 'win32' || process.platform === 'linux') {
|
||||||
if (mainWindow.isHidden || mainWindow.isMinimized()) {
|
if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
mainWindow.isHidden = false;
|
|
||||||
mainWindow.focus();
|
mainWindow.focus();
|
||||||
}
|
}
|
||||||
else if (config.toggleWindowOnTrayIconClick) {
|
else if (config.toggleWindowOnTrayIconClick) {
|
||||||
|
@ -246,9 +244,8 @@ app.on('ready', function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (process.platform === 'darwin') {
|
else if (process.platform === 'darwin') {
|
||||||
if (mainWindow.isHidden || mainWindow.isMinimized()) {
|
if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
mainWindow.isHidden = false;
|
|
||||||
mainWindow.focus();
|
mainWindow.focus();
|
||||||
app.dock.show();
|
app.dock.show();
|
||||||
}
|
}
|
||||||
|
@ -256,9 +253,6 @@ app.on('ready', function() {
|
||||||
mainWindow.focus();
|
mainWindow.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
mainWindow.focus();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
trayIcon.on('right-click', () => {
|
trayIcon.on('right-click', () => {
|
||||||
|
@ -267,7 +261,6 @@ app.on('ready', function() {
|
||||||
trayIcon.on('balloon-click', function() {
|
trayIcon.on('balloon-click', function() {
|
||||||
if (process.platform === 'win32' || process.platform === 'darwin') {
|
if (process.platform === 'win32' || process.platform === 'darwin') {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
mainWindow.isHidden = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
|
@ -404,12 +397,10 @@ app.on('ready', function() {
|
||||||
switch (process.platform) {
|
switch (process.platform) {
|
||||||
case 'win32':
|
case 'win32':
|
||||||
mainWindow.hide();
|
mainWindow.hide();
|
||||||
mainWindow.isHidden = true;
|
|
||||||
break;
|
break;
|
||||||
case 'linux':
|
case 'linux':
|
||||||
if (config.minimizeToTray) {
|
if (config.minimizeToTray) {
|
||||||
mainWindow.hide();
|
mainWindow.hide();
|
||||||
mainWindow.isHidden = true;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mainWindow.minimize();
|
mainWindow.minimize();
|
||||||
|
@ -419,7 +410,6 @@ app.on('ready', function() {
|
||||||
mainWindow.hide();
|
mainWindow.hide();
|
||||||
if (config.minimizeToTray) {
|
if (config.minimizeToTray) {
|
||||||
app.dock.hide();
|
app.dock.hide();
|
||||||
mainWindow.isHidden = true;
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -15,7 +15,6 @@ function createTemplate(mainWindow, config) {
|
||||||
click: (item, focusedWindow) => {
|
click: (item, focusedWindow) => {
|
||||||
mainWindow.show(); // for OS X
|
mainWindow.show(); // for OS X
|
||||||
mainWindow.webContents.send('switch-tab', i);
|
mainWindow.webContents.send('switch-tab', i);
|
||||||
mainWindow.isHidden = false;
|
|
||||||
|
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
app.dock.show();
|
app.dock.show();
|
||||||
|
|
Loading…
Reference in a new issue