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

Make mouse forward option of setIgnoreMouseMessages and update documentation.

Browse source
This commit is contained in:
Andreas Flöjt 2017-08-14 20:21:00 +02:00
parent 60c0bf1636
commit 3d33da7696
7 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -651,8 +651,11 @@ bool Window::IsDocumentEdited() {
return window_->IsDocumentEdited();
}
void Window::SetIgnoreMouseEvents(bool ignore) {
return window_->SetIgnoreMouseEvents(ignore);
void Window::SetIgnoreMouseEvents(bool ignore, mate::Arguments* args) {
mate::Dictionary options;
bool forward = false;
args->GetNext(&options) && options.Get("forward", &forward);
return window_->SetIgnoreMouseEvents(ignore, forward);
}
void Window::SetContentProtection(bool enable) {
@ -787,10 +790,6 @@ void Window::SetAppDetails(const mate::Dictionary& options) {
relaunch_command, relaunch_display_name,
window_->GetAcceleratedWidget());
}
void Window::SetForwardMouseMessages(bool forward) {
window_->SetForwardMouseMessages(forward);
}
#endif
#if defined(TOOLKIT_VIEWS)
@ -1064,7 +1063,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("setThumbnailClip", &Window::SetThumbnailClip)
.SetMethod("setThumbnailToolTip", &Window::SetThumbnailToolTip)
.SetMethod("setAppDetails", &Window::SetAppDetails)
.SetMethod("setForwardMouseMessages", &Window::SetForwardMouseMessages)
#endif
#if defined(TOOLKIT_VIEWS)
.SetMethod("setIcon", &Window::SetIcon)

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

@ -166,7 +166,7 @@ class Window : public mate::TrackableObject<Window>,
std::string GetRepresentedFilename();
void SetDocumentEdited(bool edited);
bool IsDocumentEdited();
void SetIgnoreMouseEvents(bool ignore);
void SetIgnoreMouseEvents(bool ignore, mate::Arguments* args);
void SetContentProtection(bool enable);
void SetFocusable(bool focusable);
void SetProgressBar(double progress, mate::Arguments* args);
@ -201,7 +201,6 @@ class Window : public mate::TrackableObject<Window>,
bool SetThumbnailClip(const gfx::Rect& region);
bool SetThumbnailToolTip(const std::string& tooltip);
void SetAppDetails(const mate::Dictionary& options);
void SetForwardMouseMessages(bool forward);
#endif
#if defined(TOOLKIT_VIEWS)