mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

don't show osr dummy window when dialog is shown on mac

Browse source
This commit is contained in:
Heilig Benedek 2017-09-13 01:26:31 +02:00 • committed by Cheng Zhao
parent 35dc6d03b9
commit 13b86598e8
3 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/browser/rpc-server.js
View file

@ -443,11 +443,15 @@ ipcMain.on('ELECTRON_BROWSER_WINDOW_ALERT', function (event, message, title) {
if (message == null) message = ''
if (title == null) title = ''
event.returnValue = electron.dialog.showMessageBox(event.sender.getOwnerBrowserWindow(), {
const dialogProperties = {
message: `${message}`,
title: `${title}`,
buttons: ['OK']
})
}
event.returnValue = event.sender.isOffscreen() ?
electron.dialog.showMessageBox(dialogProperties) :
electron.dialog.showMessageBox(
event.sender.getOwnerBrowserWindow(), dialogProperties)
})
// Implements window.confirm(message, title)
@ -455,12 +459,16 @@ ipcMain.on('ELECTRON_BROWSER_WINDOW_CONFIRM', function (event, message, title) {
if (message == null) message = ''
if (title == null) title = ''
event.returnValue = !electron.dialog.showMessageBox(event.sender.getOwnerBrowserWindow(), {
const dialogProperties = {
message: `${message}`,
title: `${title}`,
buttons: ['OK', 'Cancel'],
cancelId: 1
})
}
event.returnValue = !(event.sender.isOffscreen() ?
electron.dialog.showMessageBox(dialogProperties) :
electron.dialog.showMessageBox(
event.sender.getOwnerBrowserWindow(), dialogProperties))
})
// Implements window.close()