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

Merge branch 'master' of https://github.com/brenca/electron

Browse source 
Conflicts:
	atom/browser/api/atom_api_window.h
	atom/browser/native_window.cc
This commit is contained in:
Heilig Benedek 2015-08-31 18:46:29 +02:00
commit 3dd3fd9200
5 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -442,6 +442,10 @@ void Window::CapturePage(mate::Arguments* args) {
rect, base::Bind(&OnCapturePageDone, args->isolate(), callback));
}
void Window::SetOffscreenRender(bool isOffscreen) {
window_->SetOffscreenRender(isOffscreen);
}
void Window::SetProgressBar(double progress) {
window_->SetProgressBar(progress);
}
@ -741,6 +745,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
&Window::IsVisibleOnAllWorkspaces)
.SetMethod("sendMouseEvent", &Window::SendMouseEvent)
.SetMethod("sendKeyboardEvent", &Window::SendKeyboardEvent)
.SetMethod("setOffscreenRender", &Window::SetOffscreenRender)
#if defined(OS_MACOSX)
.SetMethod("showDefinitionForSelection",
&Window::ShowDefinitionForSelection)

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

@ -138,8 +138,10 @@ class Window : public mate::TrackableObject<Window>,
void SetMenuBarVisibility(bool visible);
bool IsMenuBarVisible();
void SetAspectRatio(double aspect_ratio, mate::Arguments* args);
void SendKeyboardEvent(v8::Isolate* isolate, const mate::Dictionary& data);
void SendMouseEvent(v8::Isolate* isolate, const mate::Dictionary& data);
void SetOffscreenRender(bool isOffscreen);
#if defined(OS_MACOSX)
void ShowDefinitionForSelection();