From 55ae88d4db97a891054f61c086324daf434790a2 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 6 Jul 2016 01:37:18 +0900 Subject: [PATCH] Refactor click event of trayIcon --- src/main.js | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main.js b/src/main.js index 2d765c55..827902b4 100644 --- a/src/main.js +++ b/src/main.js @@ -231,27 +231,18 @@ app.on('ready', function() { trayIcon.setToolTip(app.getName()); trayIcon.on('click', function() { - if (process.platform === 'win32' || process.platform === 'linux') { - if (!mainWindow.isVisible() || mainWindow.isMinimized()) { - mainWindow.show(); - mainWindow.focus(); - } - else if (config.toggleWindowOnTrayIconClick) { - mainWindow.minimize(); - } - else { - mainWindow.focus(); - } - } - else if (process.platform === 'darwin') { - if (!mainWindow.isVisible() || mainWindow.isMinimized()) { - mainWindow.show(); - mainWindow.focus(); + if (!mainWindow.isVisible() || mainWindow.isMinimized()) { + mainWindow.show(); + mainWindow.focus(); + if (process.platform === 'darwin') { app.dock.show(); } - else { - mainWindow.focus(); - } + } + else if ((process.platform === 'win32') && config.toggleWindowOnTrayIconClick) { + mainWindow.minimize(); + } + else { + mainWindow.focus(); } });