From 0621a5710c11ccaa6746b5f4e8a2bebdfad18157 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Sat, 18 Jul 2020 23:50:56 +1000
Subject: [PATCH] de-async-ifying stuff = tray fixed!

---
 repo/core/mod.js  |   2 +-
 repo/core/tray.js | 144 ++++++++++++++++++++++++----------------------
 2 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/repo/core/mod.js b/repo/core/mod.js
index 05a8f88..295e0d7 100644
--- a/repo/core/mod.js
+++ b/repo/core/mod.js
@@ -23,7 +23,7 @@ module.exports = {
     'https://camo.githubusercontent.com/5c5bca9e987d986b8cc7e51066f90c6f8a84af08/68747470733a2f2f63646e2e646973636f72646170702e636f6d2f6174746163686d656e74732f3733313634373938343332333931393933332f3733313732373235393239353032333132342f494d475f323137302e6a7067',
   options: [],
   hacks: {
-    // 'main/main.js': require('./tray.js')(defaults),
+    'main/main.js': require('./tray.js')(defaults),
     'renderer/preload.js': function (store) {
       const data = store({ name: 'dragonwocky' });
       console.log(data.name);
diff --git a/repo/core/tray.js b/repo/core/tray.js
index 729680c..0423260 100644
--- a/repo/core/tray.js
+++ b/repo/core/tray.js
@@ -6,76 +6,80 @@
  */
 
 let tray;
-const electron = require('electron'),
-  path = require('path'),
-  is_mac = process.platform === 'darwin',
-  is_win = process.platform === 'win32',
-  settings = {};
 
-electron.app.on('ready', () => {
-  tray = new electron.Tray(
-    is_win
-      ? path.resolve(__dirname, 'windows.ico')
-      : new electron.nativeImage.createFromPath(
-          path.resolve(__dirname, 'mac+linux.png')
-        ).resize({
-          width: 16,
-          height: 16,
-        })
-  );
+module.exports = (defaults) =>
+  function (store) {
+    const electron = require('electron'),
+      path = require('path'),
+      is_mac = process.platform === 'darwin',
+      is_win = process.platform === 'win32',
+      settings = store(defaults);
 
-  const contextMenu = electron.Menu.buildFromTemplate([
-    {
-      type: 'normal',
-      label: 'Bug Report',
-    },
-    {
-      type: 'normal',
-      label: 'Feature Request',
-    },
-    {
-      type: 'separator',
-    },
-    {
-      type: 'normal',
-      label: 'Docs',
-    },
-    {
-      type: 'normal',
-      label: 'Enhancements',
-    },
-    {
-      type: 'separator',
-    },
-    {
-      label: 'Quit',
-      role: 'quit',
-    },
-  ]);
-  tray.setContextMenu(contextMenu);
-  tray.setToolTip('Notion');
+    electron.app.on('ready', () => {
+      tray = new electron.Tray(
+        is_win
+          ? path.normalize(`${__dirname}/windows.ico`)
+          : new electron.nativeImage.createFromPath(
+              path.normalize(`${__dirname}/mac+linux.png`)
+            ).resize({
+              width: 16,
+              height: 16,
+            })
+      );
 
-  function showWindows() {
-    const windows = electron.BrowserWindow.getAllWindows();
-    if (is_mac) electron.app.show();
-    if (settings.maximized) windows.forEach((win) => [win.maximize()]);
-    else windows.forEach((win) => win.show());
-    electron.app.focus({ steal: true });
-  }
-  function hideWindows() {
-    const windows = electron.BrowserWindow.getAllWindows();
-    windows.forEach((win) => [win.isFocused() && win.blur(), win.hide()]);
-    if (is_mac) electron.app.hide();
-  }
-  tray.on('click', () => {
-    const windows = electron.BrowserWindow.getAllWindows();
-    if (windows.some((win) => win.isVisible())) hideWindows();
-    else showWindows();
-  });
-  electron.globalShortcut.register(settings.hotkey, () => {
-    const windows = electron.BrowserWindow.getAllWindows();
-    if (windows.some((win) => win.isFocused() && win.isVisible()))
-      hideWindows();
-    else showWindows();
-  });
-});
+      const contextMenu = electron.Menu.buildFromTemplate([
+        {
+          type: 'normal',
+          label: 'Bug Report',
+        },
+        {
+          type: 'normal',
+          label: 'Feature Request',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          type: 'normal',
+          label: 'Docs',
+        },
+        {
+          type: 'normal',
+          label: 'Enhancements',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: 'Quit',
+          role: 'quit',
+        },
+      ]);
+      tray.setContextMenu(contextMenu);
+      tray.setToolTip('Notion');
+
+      function showWindows() {
+        const windows = electron.BrowserWindow.getAllWindows();
+        if (is_mac) electron.app.show();
+        if (settings.maximized) windows.forEach((win) => [win.maximize()]);
+        else windows.forEach((win) => win.show());
+        electron.app.focus({ steal: true });
+      }
+      function hideWindows() {
+        const windows = electron.BrowserWindow.getAllWindows();
+        windows.forEach((win) => [win.isFocused() && win.blur(), win.hide()]);
+        if (is_mac) electron.app.hide();
+      }
+      tray.on('click', () => {
+        const windows = electron.BrowserWindow.getAllWindows();
+        if (windows.some((win) => win.isVisible())) hideWindows();
+        else showWindows();
+      });
+      electron.globalShortcut.register(settings.hotkey, () => {
+        const windows = electron.BrowserWindow.getAllWindows();
+        if (windows.some((win) => win.isFocused() && win.isVisible()))
+          hideWindows();
+        else showWindows();
+      });
+    });
+  };