github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 00:09:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

make sure setparentwindow only shows the window if already visible

Browse Source
This commit is contained in:
xaviergonz
2017-05-01 22:21:05 +02:00
committed by Cheng Zhao
parent dc7cc6921e
commit d0c91daaed
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atom/browser/native_window_mac.mm
View File

@@ -914,8 +914,7 @@ NativeWindowMac::NativeWindowMac(
// Only use native parent window for non-modal windows.
if (parent && !is_modal()) {
// It will be properly attached on show and detached on hide.
InternalSetParentWindow(parent, false);
SetParentWindow(parent);
}
if (transparent()) {
@@ -1566,7 +1565,7 @@ void NativeWindowMac::InternalSetParentWindow(NativeWindow* parent, bool attach)
}
void NativeWindowMac::SetParentWindow(NativeWindow* parent) {
InternalSetParentWindow(parent, true);
InternalSetParentWindow(parent, IsVisible());
}
gfx::NativeView NativeWindowMac::GetNativeView() const {