Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-10-05 10:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only prompt exit warning for keyboard shortcuts

Browse source
This commit is contained in:
Germain Souquet 2021-03-29 12:10:27 +01:00
parent 3d18ff16d1
commit d986555517
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/electron-main.js
View file

@ -27,7 +27,9 @@ const argv = require('minimist')(process.argv, {
alias: {help: "h"}, alias: {help: "h"},
}); });
const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol, dialog} = require('electron'); const {
app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol, dialog, globalShortcut,
} = require('electron');
const AutoLaunch = require('auto-launch'); const AutoLaunch = require('auto-launch');
const path = require('path'); const path = require('path');
@ -253,6 +255,22 @@ let eventIndex = null;
let mainWindow = null; let mainWindow = null;
global.appQuitting = false; global.appQuitting = false;
const warnBeforeExit = (event) => {
if (store.get('warnBeforeExit', true)) {
const shouldCancelCloseRequest = dialog.showMessageBoxSync(mainWindow, {
type: "question",
buttons: ["Cancel", "Close Element"],
message: "Are you sure you want to quit?",
defaultId: 1,
cancelId: 0,
}) === 0;
if (shouldCancelCloseRequest) {
event.preventDefault();
return false;
}
}
};
const deleteContents = async (p) => { const deleteContents = async (p) => {
for (const entry of await afs.readdir(p)) { for (const entry of await afs.readdir(p)) {
@ -923,6 +941,12 @@ app.on('ready', async () => {
} }
}); });
globalShortcut.register("CommandOrControl+Q", warnBeforeExit);
if (process.platform !== 'darwin') {
globalShortcut.register("Alt+F4", warnBeforeExit);
globalShortcut.register("AltGr+F4 ", warnBeforeExit);
}
mainWindow.on('closed', () => { mainWindow.on('closed', () => {
mainWindow = global.mainWindow = null; mainWindow = global.mainWindow = null;
}); });
@ -936,21 +960,6 @@ app.on('ready', async () => {
mainWindow.hide(); mainWindow.hide();
return false; return false;
} }
if (store.get('warnBeforeExit', true)) {
const shouldCancelCloseRequest = dialog.showMessageBoxSync(mainWindow, {
type: "question",
buttons: ["Cancel", "Close Element"],
message: "Are you sure you want to quit?",
defaultId: 1,
cancelId: 0,
}) === 0;
if (shouldCancelCloseRequest) {
e.preventDefault();
return false;
}
}
}); });
if (process.platform === 'win32') { if (process.platform === 'win32') {