From 5bc4d07aad707f8d705f09563e0a37dcd956abec Mon Sep 17 00:00:00 2001 From: Dan Nemec Date: Thu, 27 Oct 2022 19:59:41 -0500 Subject: [PATCH 1/2] Allow Mac users to close and re-open window --- electron.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/electron.js b/electron.js index 4dcce6cf3..01f1748ed 100644 --- a/electron.js +++ b/electron.js @@ -1,6 +1,6 @@ 'use strict'; -const {app, globalShortcut} = require('electron'); +const {app, globalShortcut, BrowserWindow} = require('electron'); const sqlInit = require('./src/services/sql_init'); const appIconService = require('./src/services/app_icon'); const windowService = require('./src/services/window'); @@ -32,6 +32,14 @@ app.on('ready', async () => { await windowService.createMainWindow(app); + if (process.platform === 'darwin') { + app.on('activate', async () => { + if (BrowserWindow.getAllWindows().length === 0) { + await windowService.createMainWindow(app); + } + }); + } + tray.createTray(); } else { From 47a92c8be879a4695557c1dd764e47b39ce74456 Mon Sep 17 00:00:00 2001 From: Emberlynn Bland Date: Fri, 28 Oct 2022 19:20:43 -0600 Subject: [PATCH 2/2] Fix spelling mistake "bult-in" -> "built-in" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 746a3e7e3..f7576bea9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Ukraine is currently defending itself from Russian aggression, please consider [ * there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting) * [Sharing](https://github.com/zadam/trilium/wiki/Sharing) (publishing) notes to public internet * Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity -* Sketching diagrams with bult-in Excalidraw (note type "canvas") +* Sketching diagrams with built-in Excalidraw (note type "canvas") * [Relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map) for visualizing notes and their relations * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases) * [REST API](https://github.com/zadam/trilium/wiki/ETAPI) for automation