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

Parent's visibility trumps inherited 'show' option

Browse source
This commit is contained in:
Charles Kerr 2018-03-13 00:28:34 +09:00
parent dd2c2660b9
commit 685948bcaa
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/browser/guest-window-manager.js
View file

@ -47,8 +47,19 @@ const mergeBrowserWindowOptions = function (embedder, options) {
options.webPreferences = {}
}
if (embedder.browserWindowOptions != null) {
let parentOptions = {...embedder.browserWindowOptions}
// if parent's visibility is available, that overrides 'show' flag (#12125)
const win = BrowserWindow.fromWebContents(embedder.webContents)
if (win != null) {
const show = win.isVisible()
if (typeof show === 'boolean') {
parentOptions.show = show
}
}
// Inherit the original options if it is a BrowserWindow.
mergeOptions(options, embedder.browserWindowOptions)
mergeOptions(options, parentOptions)
} else {
// Or only inherit webPreferences if it is a webview.
mergeOptions(options.webPreferences, embedder.getWebPreferences())