take trayIcon oncklick event out of creation function

This commit is contained in:
GHOSCHT 2020-08-07 16:25:09 +02:00
parent fed5b2daf0
commit c2c951edc6

View file

@ -10,6 +10,7 @@ const trayIconPath = '../../dist-assets/tray.ico';
let mainWindow = null; let mainWindow = null;
let mainWindowHidden = true; let mainWindowHidden = true;
let trayIcon = null;
const isDevelopment = process.env.NODE_ENV === 'development'; const isDevelopment = process.env.NODE_ENV === 'development';
const gotTheLock = app.requestSingleInstanceLock(); const gotTheLock = app.requestSingleInstanceLock();
app.allowRendererProcessReuse = false; app.allowRendererProcessReuse = false;
@ -62,24 +63,16 @@ if (!gotTheLock) {
mainWindow.setMenu(null); mainWindow.setMenu(null);
mainWindow.loadFile(path.resolve(path.join(__dirname, '../renderer/index.html'))); mainWindow.loadFile(path.resolve(path.join(__dirname, '../renderer/index.html')));
createTray(); trayIcon = createTray();
trayIcon.on('click', () => {
mainWindow.show();
mainWindow.focus();
});
mainWindow.webContents.on('did-finish-load', () => { mainWindow.webContents.on('did-finish-load', () => {
mainWindow.webContents.openDevTools(); mainWindow.webContents.openDevTools();
}); });
if (isDevelopment) {
mainWindow.webContents.on('context-menu', (e, props) => {
Menu.buildFromTemplate([
{
label: 'Inspect element',
click() {
mainWindow.inspectElement(props.x, props.y);
},
},
]).popup(mainWindow);
});
}
}); });
} }
@ -102,11 +95,6 @@ function createTray() {
}, },
]); ]);
trayIcon.on('click', () => {
mainWindow.show();
mainWindow.focus();
});
trayIcon.setToolTip('Light Control'); trayIcon.setToolTip('Light Control');
trayIcon.setContextMenu(contextMenu); trayIcon.setContextMenu(contextMenu);
return trayIcon; return trayIcon;