Merge pull request #390 from getferdi/refactor/tray

Refactor Tray behavior/settings

5 files changed, 16 insertions, 11 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 2797a2dce..6017252bc 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -252,6 +252,9 @@ export default @observer class EditSettingsForm extends Component {
             <Toggle field={form.$('runInBackground')} />
             <Toggle field={form.$('enableSystemTray')} />
             {isTrayEnabled && <Toggle field={form.$('startMinimized')} />}
+            {process.platform === 'win32' && (
+              <Toggle field={form.$('minimizeToSystemTray')} />
+            )}
             <Toggle field={form.$('privateNotifications')} />
             <Toggle field={form.$('showServiceNavigationBar')} />
 
@@ -279,10 +282,6 @@ export default @observer class EditSettingsForm extends Component {
 
             <Hr />
 
-            {process.platform === 'win32' && (
-              <Toggle field={form.$('minimizeToSystemTray')} />
-            )}
-
             <Input
               placeholder="Server"
               onChange={e => this.submit(e)}
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 595cfdcc7..8eb7c3b82 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -44,7 +44,7 @@ const messages = defineMessages({
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Show Ferdi in system tray',
+    defaultMessage: '!!!Always show Ferdi in system tray',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 6ac9153a4..17f77b609 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4136,7 +4136,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Show Ferdi in system tray",
+        "defaultMessage": "!!!Always show Ferdi in system tray",
         "end": {
           "column": 3,
           "line": 48
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 22417f340..d2e53d625 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -53,7 +53,7 @@
   },
   {
     "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Ferdi in system tray",
+    "defaultMessage": "!!!Always show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 45,
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index c0d936599..84ee8e3bb 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Tray, Menu, systemPreferences, nativeTheme, nativeImage,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray,
 } from 'electron';
 import path from 'path';
 
@@ -37,14 +37,20 @@ export default class TrayIcon {
     ];
 
     const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-    this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
       if (app.mainWindow.isMinimized()) {
         app.mainWindow.restore();
+      } else if (app.mainWindow.isVisible()) {
+        app.mainWindow.hide();
+      } else {
+        app.mainWindow.show();
+        app.mainWindow.focus();
       }
-      app.mainWindow.show();
-      app.mainWindow.focus();
+    });
+
+    this.trayIcon.on('right-click', () => {
+      this.trayIcon.popUpContextMenu(trayMenu);
     });
 
     if (process.platform === 'darwin') {