diff options
author | Itamar <itamar8910@gmail.com> | 2022-12-31 16:40:36 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-12-31 16:17:48 +0100 |
commit | a802fb20238366c42aba975cfce075173544a51c (patch) | |
tree | 1ab5eb7e951035a0e5a71a5fe2f2bfbbfa133cf3 /Userland/Libraries/LibWeb/UIEvents | |
parent | f6862a42030bda45457415aea6900c6f5b79eb14 (diff) | |
download | serenity-a802fb20238366c42aba975cfce075173544a51c.zip |
LibWeb: Support MouseEvent.{pageX,pageY}
Unlike client{X,Y} which is relative to the current viewport, these
offsets are relative to the left edge of the document (i.e they take
scroll offset into account).
Diffstat (limited to 'Userland/Libraries/LibWeb/UIEvents')
-rw-r--r-- | Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/UIEvents/MouseEvent.h | 9 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp index d7124ddb0a..2e5c19f8f4 100644 --- a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp +++ b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp @@ -19,6 +19,8 @@ MouseEvent::MouseEvent(JS::Realm& realm, FlyString const& event_name, MouseEvent , m_offset_y(event_init.offset_y) , m_client_x(event_init.client_x) , m_client_y(event_init.client_y) + , m_page_x(event_init.page_x) + , m_page_y(event_init.page_y) , m_button(event_init.button) , m_buttons(event_init.buttons) { @@ -52,13 +54,15 @@ MouseEvent* MouseEvent::create(JS::Realm& realm, FlyString const& event_name, Mo return realm.heap().allocate<MouseEvent>(realm, realm, event_name, event_init); } -MouseEvent* MouseEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, unsigned buttons, unsigned mouse_button) +MouseEvent* MouseEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, CSSPixelPoint page_offset, unsigned buttons, unsigned mouse_button) { MouseEventInit event_init {}; event_init.offset_x = static_cast<double>(offset.x().value()); event_init.offset_y = static_cast<double>(offset.y().value()); event_init.client_x = static_cast<double>(client_offset.x().value()); event_init.client_y = static_cast<double>(client_offset.y().value()); + event_init.page_x = static_cast<double>(page_offset.x().value()); + event_init.page_y = static_cast<double>(page_offset.y().value()); event_init.button = determine_button(mouse_button); event_init.buttons = buttons; return MouseEvent::create(realm, event_name, event_init); diff --git a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h index 51eeab7e5e..c337bc84df 100644 --- a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h +++ b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h @@ -18,6 +18,8 @@ struct MouseEventInit : public EventModifierInit { double offset_y = 0; double client_x = 0; double client_y = 0; + double page_x = 0; + double page_y = 0; i16 button = 0; u16 buttons = 0; @@ -28,7 +30,7 @@ class MouseEvent : public UIEvent { public: static MouseEvent* create(JS::Realm&, FlyString const& event_name, MouseEventInit const& event_init = {}); - static MouseEvent* create_from_platform_event(JS::Realm&, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, unsigned buttons, unsigned mouse_button = 1); + static MouseEvent* create_from_platform_event(JS::Realm&, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, CSSPixelPoint page_offset, unsigned buttons, unsigned mouse_button = 1); virtual ~MouseEvent() override; @@ -42,6 +44,9 @@ public: double screen_x() const { return m_client_x; } double screen_y() const { return m_client_y; } + double page_x() const { return m_page_x; } + double page_y() const { return m_page_y; } + double x() const { return client_x(); } double y() const { return client_y(); } @@ -60,6 +65,8 @@ private: double m_offset_y { 0 }; double m_client_x { 0 }; double m_client_y { 0 }; + double m_page_x { 0 }; + double m_page_y { 0 }; i16 m_button { 0 }; u16 m_buttons { 0 }; }; diff --git a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl index 94b2c67902..449253ab6c 100644 --- a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl +++ b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl @@ -10,6 +10,8 @@ interface MouseEvent : UIEvent { readonly attribute double screenY; readonly attribute double x; readonly attribute double y; + readonly attribute double pageX; + readonly attribute double pageY; readonly attribute short button; readonly attribute unsigned short buttons; |