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

Move disable counter to NativeWindow from api::Window

Browse source
This commit is contained in:
Cheng Zhao 2016-06-20 11:48:46 +09:00
parent 946d246aea
commit 1866dbe608
8 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/api/atom_api_window.cc
View file

@ -77,8 +77,7 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
Window::Window(v8::Isolate* isolate, const mate::Dictionary& options)
: disable_count_(0),
is_modal_(false) {
: is_modal_(false) {
// Use options.webPreferences to create WebContents.
mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
options.Get(options::kWebPreferences, &web_preferences);
@ -325,15 +324,11 @@ bool Window::IsVisible() {
}
void Window::Disable() {
++disable_count_;
if (disable_count_ == 1)
window_->Disable();
window_->Disable();
}
void Window::Enable() {
--disable_count_;
if (disable_count_ == 0)
window_->Enable();
window_->Enable();
}
bool Window::IsEnabled() {

3
atom/browser/api/atom_api_window.h
View file

@ -209,9 +209,6 @@ class Window : public mate::TrackableObject<Window>,
v8::Global<v8::Value> parent_window_;
KeyWeakMap<int> child_windows_;
// How many times the Disable has been called.
int disable_count_;
// Is current window modal.
bool is_modal_;