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

Merge pull request #5701 from danhp/propagate-close

Browse Source 
Properly notify observers when window prevents close
This commit is contained in:
Cheng Zhao
2016-05-26 05:33:55 +00:00
parent 93b8237e1f d1c302800f
commit 20b09e9d03
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
atom/browser/native_window_mac.mm
View File

@@ -6,6 +6,7 @@
#include <string>
#include "atom/browser/window_list.h"
#include "atom/common/color_util.h"
#include "atom/common/draggable_region.h"
#include "atom/common/options_switches.h"
@@ -553,6 +554,11 @@ NativeWindowMac::~NativeWindowMac() {
}
void NativeWindowMac::Close() {
if (!IsClosable()) {
WindowList::WindowCloseCancelled(this);
return;
}
[window_ performClose:nil];
}

6
atom/browser/native_window_views.cc
View File

@@ -9,6 +9,7 @@
#include "atom/browser/ui/views/menu_bar.h"
#include "atom/browser/ui/views/menu_layout.h"
#include "atom/browser/window_list.h"
#include "atom/common/color_util.h"
#include "atom/common/draggable_region.h"
#include "atom/common/native_mate_converters/image_converter.h"
@@ -284,6 +285,11 @@ NativeWindowViews::~NativeWindowViews() {
}
void NativeWindowViews::Close() {
if (!IsClosable()) {
WindowList::WindowCloseCancelled(this);
return;
}
window_->Close();
}