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

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