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

Group sheet event methods with other macOS methods

Browse source
This commit is contained in:
Kevin Sawicki 2017-04-20 10:31:25 -07:00
parent 75184046f6
commit 29a3e11893
5 changed files with 24 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,6 +263,14 @@ void Window::OnWindowSwipe(const std::string& direction) {
Emit("swipe", direction);
}
void Window::OnWindowSheetBegin() {
Emit("sheet-begin");
}
void Window::OnWindowSheetEnd() {
Emit("sheet-end");
}
void Window::OnWindowEnterHtmlFullScreen() {
Emit("enter-html-full-screen");
}
@ -298,16 +306,6 @@ void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
}
#endif
#if defined(OS_MACOSX)
void Window::OnWindowSheetBegin() {
Emit("sheet-begin");
}
void Window::OnWindowSheetEnd() {
Emit("sheet-end");
}
#endif
// static
mate::WrappableBase* Window::New(mate::Arguments* args) {
if (!Browser::Get()->is_ready()) {

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

@ -79,6 +79,8 @@ class Window : public mate::TrackableObject<Window>,
void OnWindowScrollTouchEnd() override;
void OnWindowScrollTouchEdge() override;
void OnWindowSwipe(const std::string& direction) override;
void OnWindowSheetBegin() override;
void OnWindowSheetEnd() override;
void OnWindowEnterFullScreen() override;
void OnWindowLeaveFullScreen() override;
void OnWindowEnterHtmlFullScreen() override;
@ -93,11 +95,6 @@ class Window : public mate::TrackableObject<Window>,
void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
#endif
#if defined(OS_MACOSX)
void OnWindowSheetBegin() override;
void OnWindowSheetEnd() override;
#endif
private:
void Init(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper,