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

adds test, adds view to AtomNSWindow and minor fixes

Browse source
This commit is contained in:
gellert 2016-11-10 20:36:21 +01:00 • committed by Kevin Sawicki
parent 2cf30c0d63
commit 5e62d28e50
6 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -786,16 +786,11 @@ bool Window::IsVisibleOnAllWorkspaces() {
return window_->IsVisibleOnAllWorkspaces();
}
void Window::SetVibrancy(v8::Local<v8::Value> value, mate::Arguments* args) {
void Window::SetVibrancy(mate::Arguments* args) {
std::string type;
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");
}
args->GetNext(&type);
window_->SetVibrancy(type);
}
int32_t Window::ID() const {

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

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