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

Merge pull request #7131 from electron/end-sheet-on-close

Browse source 
End sheet in parent when closing modal window
This commit is contained in:
Cheng Zhao 2016-09-08 15:53:07 +09:00 • committed by GitHub
commit 2885e980a5
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_mac.mm
View file

@ -619,6 +619,7 @@ NativeWindowMac::~NativeWindowMac() {
void NativeWindowMac::Close() { void NativeWindowMac::Close() {
// When this is a sheet showing, performClose won't work. // When this is a sheet showing, performClose won't work.
if (is_modal() && parent() && IsVisible()) { if (is_modal() && parent() && IsVisible()) {
[parent()->GetNativeWindow() endSheet:window_];
CloseImmediately(); CloseImmediately();
return; return;
} }