Merge pull request #853 from yuya-oc/startup-as-hidden

Hide the main window on Mac auto-start

src/main.js

@@ -50,6 +50,7 @@ import PermissionManager from './main/PermissionManager';
 import permissionRequestHandler from './main/permissionRequestHandler';
 import AppStateManager from './main/AppStateManager';
 import initCookieManager from './main/cookieManager';
+import {shouldBeHiddenOnStartup} from './main/utils';
 
 import SpellChecker from './main/SpellChecker';
 
@@ -65,11 +66,7 @@ let appState = null;
 let permissionManager = null;
 
 const argv = parseArgv(process.argv.slice(1));
-
+const hideOnStartup = shouldBeHiddenOnStartup(argv);
-var hideOnStartup;
-if (argv.hidden) {
-  hideOnStartup = true;
-}
 
 if (argv['data-dir']) {
   app.setPath('userData', path.resolve(argv['data-dir']));

src/main/utils.js

@@ -0,0 +1,17 @@
+// Copyright (c) 2015-2016 Yuya Ochiai
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {app} from 'electron';
+
+export function shouldBeHiddenOnStartup(parsedArgv) {
+  if (parsedArgv.hidden) {
+    return true;
+  }
+  if (process.platform === 'darwin') {
+    if (app.getLoginItemSettings().wasOpenedAsHidden) {
+      return true;
+    }
+  }
+  return false;
+}