From 0e168b5f845a385129a0798017074f88212e1b69 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Thu, 9 Jul 2020 18:50:50 +1000
Subject: [PATCH] close to tray for macOS's native close window button

---
 CHANGELOG.md         |  1 +
 README.md            |  6 ++++--
 customiser.py        | 15 +++++++++++++--
 resources/preload.js |  1 -
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 753a699..b2215af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ but can still easily be enabled by following instructions in the [docs](README.m
 - new: mac support (identical functionality to others platforms with the
   exception of the native minimise/maximise/close buttons being kept, as they integrate
   better with the OS while not being out-of-place in notion).
+- new: notion-deb-builder support for linux.
 - improved: replaced button symbols with svgs for multi-platform support.
 - improved: window close button is now red on hover (thanks to [@torchatlas](https://github.com/torchatlas)).
 - bugfix: `cleaner.py` patched for linux.
diff --git a/README.md b/README.md
index 291673e..e8ed8f3 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 
 an enhancer/customiser for the all-in-one productivity workspace [notion.so](https://www.notion.so/)
 
-## installation
+## supported clients
 
 there are a lot of ways to use notion. some official clients, many not.
 
 the enhancer supports:
 
-- the windows/mac versions of the app downloadable from [https://notion.so/desktop](https://notion.so/desktop).
+- the [official windows/mac releases](https://notion.so/desktop).
 - the arch linux AUR [notion-app](https://aur.archlinux.org/packages/notion-app/) package
 - the linux [notion-app](https://github.com/jaredallard/notion-app) installer
 - the debian [notion-deb-builder](https://github.com/davidbailey00/notion-deb-builder/tree/229f2868e117e81858618783b83babd00c595000).
@@ -29,6 +29,8 @@ or a built-in feature like [userChrome.css](https://www.userchrome.org/).)
 
 if the script is run from the WSL, it will enhance the windows version of the app.
 
+## installation
+
 1. install node.js: [windows/macOS](https://nodejs.org/en/download/), [linux/WSL](https://github.com/mklement0/n-install).
 2. install python: [windows/macOS](https://www.python.org/downloads/), [linux/WSL](https://docs.python-guide.org/starting/install3/linux/).
 3. reboot.
diff --git a/customiser.py b/customiser.py
index db203a2..2cf6cb7 100755
--- a/customiser.py
+++ b/customiser.py
@@ -13,7 +13,7 @@ from shutil import copyfile, rmtree
 from time import sleep
 
 # to smooth the update process
-enhancer_version = '0.6.1~beta3'
+enhancer_version = '0.6.1~beta4'
 
 # for toggling notion visibility
 hotkey = 'CmdOrCtrl+Shift+A'
@@ -149,11 +149,22 @@ try:
                         config: 'user-preferences',
                         defaults: {
                             openhidden: false,
-                            maximized: false
+                            maximized: false,
+                            tray: false,
                         }
                     });
                 if (!store.openhidden || electron_1.BrowserWindow.getAllWindows().some(win => win.isVisible()))
                     { window.show(); if (store.maximized) window.maximize(); }
+                let appQuit = false;
+                window.on('close', (e) => {
+                    if (appQuit || !store.tray) window = null;
+                    else {
+                        e.preventDefault();
+                        window.hide();
+                    }
+                });
+                electron_1.app.on('activate', () => window.show());
+                electron_1.app.on('before-quit', () => (appQuit = true));
                 /* === INJECTION END === */
             """)
             with open(os.path.join(filepath, "app", "main", "createWindow.js"), 'w', encoding='UTF-8') as write:
diff --git a/resources/preload.js b/resources/preload.js
index a045bc2..20f1682 100644
--- a/resources/preload.js
+++ b/resources/preload.js
@@ -151,7 +151,6 @@ require('electron').remote.getGlobal('setTimeout')(() => {
       button_elements.close.innerHTML = button_icons.close();
       button_elements.close.onclick = button_actions.close;
     }
-    appwindow.on('close', button_actions.close);
 
     /* hotkey: reload window */
     document.defaultView.addEventListener(