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

remove method transferred to set with null

Browse source
This commit is contained in:
gellert 2016-11-10 11:59:25 +01:00 • committed by Kevin Sawicki
parent 16253fe708
commit 2cf30c0d63
7 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -786,12 +786,16 @@ bool Window::IsVisibleOnAllWorkspaces() {
return window_->IsVisibleOnAllWorkspaces();
}
void Window::SetVibrancy(const std::string& type) {
window_->SetVibrancy(type);
}
void Window::SetVibrancy(v8::Local<v8::Value> value, mate::Arguments* args) {
std::string type;
void Window::RemoveVibrancy() {
window_->RemoveVibrancy();
if (value->IsNull()) {
window_->SetVibrancy(std::string());
} else if (mate::ConvertFromV8(isolate(), value, &type)) {
window_->SetVibrancy(type);
} else {
args->ThrowError("Must pass a string or null");
}
}
int32_t Window::ID() const {
@ -910,7 +914,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isVisibleOnAllWorkspaces",
&Window::IsVisibleOnAllWorkspaces)
.SetMethod("setVibrancy", &Window::SetVibrancy)
.SetMethod("removeVibrancy", &Window::RemoveVibrancy)
#if defined(OS_WIN)
.SetMethod("hookWindowMessage", &Window::HookWindowMessage)
.SetMethod("isWindowMessageHooked", &Window::IsWindowMessageHooked)

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

@ -196,8 +196,7 @@ class Window : public mate::TrackableObject<Window>,
void SetVisibleOnAllWorkspaces(bool visible);
bool IsVisibleOnAllWorkspaces();
void SetVibrancy(const std::string& type);
void RemoveVibrancy();
void SetVibrancy(v8::Local<v8::Value> value, mate::Arguments* args);
int32_t ID() const;
v8::Local<v8::Value> WebContents(v8::Isolate* isolate);