mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 08:37:35 +00:00
LibWeb: Partially implement MouseEvent.movementX/movementY
Currently doesn't handle the mouse leaving and entering the window per the spec, and uses clientX/Y instead of screenX/Y. See FIXMEs.
This commit is contained in:
parent
ebb7079795
commit
e0e67a2b27
5 changed files with 51 additions and 8 deletions
|
@ -21,6 +21,8 @@ MouseEvent::MouseEvent(JS::Realm& realm, FlyString const& event_name, MouseEvent
|
|||
, m_client_y(event_init.client_y)
|
||||
, m_page_x(event_init.page_x)
|
||||
, m_page_y(event_init.page_y)
|
||||
, m_movement_x(event_init.movement_x)
|
||||
, m_movement_y(event_init.movement_y)
|
||||
, m_button(event_init.button)
|
||||
, m_buttons(event_init.buttons)
|
||||
{
|
||||
|
@ -59,7 +61,7 @@ JS::NonnullGCPtr<MouseEvent> MouseEvent::create(JS::Realm& realm, FlyString cons
|
|||
return realm.heap().allocate<MouseEvent>(realm, realm, event_name, event_init);
|
||||
}
|
||||
|
||||
WebIDL::ExceptionOr<JS::NonnullGCPtr<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)
|
||||
WebIDL::ExceptionOr<JS::NonnullGCPtr<MouseEvent>> MouseEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, CSSPixelPoint page_offset, Optional<CSSPixelPoint> movement, unsigned buttons, unsigned mouse_button)
|
||||
{
|
||||
MouseEventInit event_init {};
|
||||
event_init.offset_x = offset.x().to_double();
|
||||
|
@ -68,6 +70,10 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<MouseEvent>> MouseEvent::create_from_platfo
|
|||
event_init.client_y = client_offset.y().to_double();
|
||||
event_init.page_x = page_offset.x().to_double();
|
||||
event_init.page_y = page_offset.y().to_double();
|
||||
if (movement.has_value()) {
|
||||
event_init.movement_x = movement.value().x().to_double();
|
||||
event_init.movement_y = movement.value().y().to_double();
|
||||
}
|
||||
event_init.button = determine_button(mouse_button);
|
||||
event_init.buttons = buttons;
|
||||
return MouseEvent::create(realm, event_name, event_init);
|
||||
|
|
|
@ -20,6 +20,8 @@ struct MouseEventInit : public EventModifierInit {
|
|||
double client_y = 0;
|
||||
double page_x = 0;
|
||||
double page_y = 0;
|
||||
double movement_x = 0;
|
||||
double movement_y = 0;
|
||||
|
||||
i16 button = 0;
|
||||
u16 buttons = 0;
|
||||
|
@ -30,7 +32,7 @@ class MouseEvent : public UIEvent {
|
|||
|
||||
public:
|
||||
[[nodiscard]] static JS::NonnullGCPtr<MouseEvent> create(JS::Realm&, FlyString const& event_name, MouseEventInit const& = {});
|
||||
static WebIDL::ExceptionOr<JS::NonnullGCPtr<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);
|
||||
static WebIDL::ExceptionOr<JS::NonnullGCPtr<MouseEvent>> create_from_platform_event(JS::Realm&, FlyString const& event_name, CSSPixelPoint offset, CSSPixelPoint client_offset, CSSPixelPoint page_offset, Optional<CSSPixelPoint> movement, unsigned buttons, unsigned mouse_button = 1);
|
||||
|
||||
virtual ~MouseEvent() override;
|
||||
|
||||
|
@ -50,6 +52,9 @@ public:
|
|||
double x() const { return client_x(); }
|
||||
double y() const { return client_y(); }
|
||||
|
||||
double movement_x() const { return m_movement_x; }
|
||||
double movement_y() const { return m_movement_y; }
|
||||
|
||||
i16 button() const { return m_button; }
|
||||
u16 buttons() const { return m_buttons; }
|
||||
|
||||
|
@ -69,6 +74,8 @@ private:
|
|||
double m_client_y { 0 };
|
||||
double m_page_x { 0 };
|
||||
double m_page_y { 0 };
|
||||
double m_movement_x { 0 };
|
||||
double m_movement_y { 0 };
|
||||
i16 m_button { 0 };
|
||||
u16 m_buttons { 0 };
|
||||
};
|
||||
|
|
|
@ -13,6 +13,10 @@ interface MouseEvent : UIEvent {
|
|||
readonly attribute double pageX;
|
||||
readonly attribute double pageY;
|
||||
|
||||
// https://w3c.github.io/pointerlock/#extensions-to-the-mouseevent-interface
|
||||
readonly attribute double movementX;
|
||||
readonly attribute double movementY;
|
||||
|
||||
readonly attribute short button;
|
||||
readonly attribute unsigned short buttons;
|
||||
};
|
||||
|
@ -25,6 +29,10 @@ dictionary MouseEventInit : EventModifierInit {
|
|||
double clientX = 0;
|
||||
double clientY = 0;
|
||||
|
||||
// https://w3c.github.io/pointerlock/#extensions-to-the-mouseeventinit-dictionary
|
||||
double movementX = 0;
|
||||
double movementY = 0;
|
||||
|
||||
short button = 0;
|
||||
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue