Browse Source

Fixed unread bug on window closed and keep in tray

Fixes #2189
pull/2255/head
Ramiro Saenz 6 years ago
parent
commit
4b0c54f7fc
  1. 14
      electron/main.js

14
electron/main.js

@ -190,8 +190,6 @@ function createWindow () {
default:
switch (config.get('window_close_behavior')) {
case 'keep_in_tray':
mainWindow.hide();
break;
case 'keep_in_tray_and_taskbar':
mainWindow.minimize();
break;
@ -203,6 +201,15 @@ function createWindow () {
}
}
});
mainWindow.on('minimize', function(e) {
if ( config.get('window_close_behavior') === 'keep_in_tray' ) mainWindow.setSkipTaskbar(true);
});
mainWindow.on('restore', function(e) {
if ( config.get('window_display_behavior') === 'show_taskbar' ) mainWindow.setSkipTaskbar(false);
});
mainWindow.on('show', function(e) {
if ( config.get('window_display_behavior') !== 'show_trayIcon' ) mainWindow.setSkipTaskbar(false);
});
mainWindow.on('closed', function(e) {
mainWindow = null;
});
@ -256,7 +263,7 @@ ipcMain.on('setConfig', function(event, values) {
// always_on_top
mainWindow.setAlwaysOnTop(values.always_on_top);
// auto_launch
values.auto_launch ? appLauncher.enable() : appLauncher.disable();
if ( !isDev ) values.auto_launch ? appLauncher.enable() : appLauncher.disable();
// systemtray_indicator
updateBadge(mainWindow.getTitle());
@ -399,6 +406,7 @@ ipcMain.on('image:popup', function(event, url, partition) {
});
ipcMain.on('toggleWin', function(event, allwaysShow) {
if ( config.get('window_display_behavior') !== 'show_trayIcon' ) mainWindow.setSkipTaskbar(false);
if ( !mainWindow.isMinimized() && mainWindow.isMaximized() && mainWindow.isVisible() ) { // Maximized
!allwaysShow ? mainWindow.close() : mainWindow.show();
} else if ( mainWindow.isMinimized() && !mainWindow.isMaximized() && !mainWindow.isVisible() ) { // Minimized

Loading…
Cancel
Save