beenull/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename and prune

Browse source
This commit is contained in:
Manav Rathi 2024-04-12 14:00:35 +05:30
parent d1d9cd9518
commit 8045bd1e5a
No known key found for this signature in database
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
desktop/src/main.ts
View file

@ -36,24 +36,26 @@ export const rendererURL = "next://app";
/**
* We want to hide our window instead of closing it when the user presses the
* cross button on the window (this is because there is 1. a perceptible initial
* window creation time for our app, and 2. because the long running processes
* like export and watch folders are tied to the lifetime of the window and
* otherwise won't run in the background.
* cross button on the window.
*
* > This is because there is 1. a perceptible initial window creation time for
* > our app, and 2. because the long running processes like export and watch
* > folders are tied to the lifetime of the window and otherwise won't run in
* > the background.
*
* Intercepting the window close event and using that to instead hide it is
* easy, however that prevents the actual app quit to stop working (since the
* window never gets closed).
*
* So to achieve our original goal (hide window instead of closing) without
* disabling expected app quits, we keep this `allowWindowClose` flag. It is off
* by default, but in the cases where we *do* want the app to quit, we set it to
* true beforehand before calling the actual process that'll do the quitting.
* disabling expected app quits, we keep a flag, and we turn it on when we're
* part of the quit sequence. When this flag is on, we bypass the code that
* prevents the window from being closed.
*/
let allowWindowClose = false;
let shouldAllowWindowClose = false;
export const setIsAppQuitting = (value: boolean): void => {
allowWindowClose = value;
export const allowWindowClose = (): void => {
shouldAllowWindowClose = true;
};
/**
@ -154,8 +156,8 @@ const createMainWindow = async () => {
window.webContents.forcefullyCrashRenderer();
});
window.on("close", function (event) {
if (!allowWindowClose) {
window.on("close", (event) => {
if (!shouldAllowWindowClose) {
event.preventDefault();
window.hide();
}
@ -288,7 +290,7 @@ const main = () => {
// app, e.g. by clicking on its dock icon.
app.on("activate", () => mainWindow?.show());
app.on("before-quit", () => setIsAppQuitting(true));
app.on("before-quit", allowWindowClose);
};
main();

4
desktop/src/main/menu.ts
View file

@ -5,7 +5,7 @@ import {
MenuItemConstructorOptions,
shell,
} from "electron";
import { setIsAppQuitting } from "../main";
import { allowWindowClose } from "../main";
import { forceCheckForAppUpdates } from "./services/app-update";
import autoLauncher from "./services/autoLauncher";
import { userPreferences } from "./stores/user-preferences";
@ -195,7 +195,7 @@ export const createTrayContextMenu = (mainWindow: BrowserWindow) => {
};
const handleClose = () => {
setIsAppQuitting(true);
allowWindowClose();
app.quit();
};

4
desktop/src/main/services/app-update.ts
View file

@ -2,7 +2,7 @@ import { compareVersions } from "compare-versions";
import { app, BrowserWindow } from "electron";
import { default as electronLog } from "electron-log";
import { autoUpdater } from "electron-updater";
import { setIsAppQuitting } from "../../main";
import { allowWindowClose } from "../../main";
import { AppUpdateInfo } from "../../types/ipc";
import log from "../log";
import { userPreferences } from "../stores/user-preferences";
@ -83,7 +83,7 @@ export const appVersion = () => `v${app.getVersion()}`;
export const updateAndRestart = () => {
log.info("Restarting the app to apply update");
setIsAppQuitting(true);
allowWindowClose();
autoUpdater.quitAndInstall();
};