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

don't show the dummy window for the rest of the dialogs too on mac

Browse source
This commit is contained in:
Heilig Benedek 2017-09-13 09:36:28 +02:00 • committed by Cheng Zhao
parent 5373afa472
commit 71b36ef54d
7 changed files with 51 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/ui/message_box_mac.mm
View file

@ -146,7 +146,8 @@ int ShowMessageBox(NativeWindow* parent_window,
// Use runModal for synchronous alert without parent, since we don't have a
// window to wait for.
if (!parent_window || !parent_window->GetNativeWindow())
if (!parent_window || !parent_window->GetNativeWindow() ||
parent_window->IsOffScreenDummy())
return [[alert autorelease] runModal];
int ret_code = -1;
@ -184,8 +185,10 @@ void ShowMessageBox(NativeWindow* parent_window,
// Use runModal for synchronous alert without parent, since we don't have a
// window to wait for.
if (!parent_window || !parent_window->GetNativeWindow()) {
[[alert autorelease] runModal];
if (!parent_window || !parent_window->GetNativeWindow() ||
parent_window->IsOffScreenDummy()) {
int ret = [[alert autorelease] runModal];
callback.Run(ret, false);
} else {
ModalDelegate* delegate = [[ModalDelegate alloc] initWithCallback:callback
andAlert:alert