Merge branch 'master' into ee_dev

This commit is contained in:
gsx
2022-03-29 18:54:44 +08:00

View File

@@ -39,7 +39,7 @@ module.exports = {
// 点击关闭,最小化到托盘 // 点击关闭,最小化到托盘
mainWindow.on('close', (event) => { mainWindow.on('close', (event) => {
mainWindow.hide(); mainWindow.hide();
mainWindow.setSkipTaskbar(true); //mainWindow.setSkipTaskbar(true);
event.preventDefault(); event.preventDefault();
}); });
mainWindow.show(); mainWindow.show();
@@ -59,10 +59,10 @@ module.exports = {
appTray.on('click', function(){ appTray.on('click', function(){
if (mainWindow.isVisible()) { if (mainWindow.isVisible()) {
mainWindow.hide(); mainWindow.hide();
mainWindow.setSkipTaskbar(false); //mainWindow.setSkipTaskbar(true);
} else { } else {
mainWindow.show(); mainWindow.show();
mainWindow.setSkipTaskbar(true); //mainWindow.setSkipTaskbar(false);
} }
}); });
} }