RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 09:17:45 +00:00
Code Issues Activity Actions

LibWeb: Add button property in MouseEvent

Browse source
This commit is contained in:
Aliaksandr Kalenik 2022-10-20 20:56:38 +03:00 • committed by Linus Groh
parent 501fb1cccb
commit 9cbf031b6d
10 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/UIEvents/MouseEvent.cpp
View file

@ -20,6 +20,7 @@ MouseEvent::MouseEvent(JS::Realm& realm, FlyString const& event_name, MouseEvent
, m_client_x(event_init.client_x)
, m_client_y(event_init.client_y)
, m_button(event_init.button)
, m_buttons(event_init.buttons)
{
set_prototype(&Bindings::cached_web_prototype(realm, "MouseEvent"));
set_event_characteristics();
@ -51,7 +52,7 @@ 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, double offset_x, double offset_y, double client_x, double client_y, unsigned mouse_button)
MouseEvent* MouseEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, unsigned buttons, unsigned mouse_button)
{
MouseEventInit event_init {};
event_init.offset_x = offset_x;
@ -59,6 +60,7 @@ MouseEvent* MouseEvent::create_from_platform_event(JS::Realm& realm, FlyString c
event_init.client_x = client_x;
event_init.client_y = client_y;
event_init.button = determine_button(mouse_button);
event_init.buttons = buttons;
return MouseEvent::create(realm, event_name, event_init);
}

5
Userland/Libraries/LibWeb/UIEvents/MouseEvent.h
View file

@ -19,6 +19,7 @@ struct MouseEventInit : public EventModifierInit {
double client_y = 0;
i16 button = 0;
u16 buttons = 0;
};
class MouseEvent : public UIEvent {
@ -26,7 +27,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, double offset_x, double offset_y, double client_x, double client_y, unsigned mouse_button = 1);
static MouseEvent* create_from_platform_event(JS::Realm&, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, unsigned buttons, unsigned mouse_button = 1);
virtual ~MouseEvent() override;
@ -40,6 +41,7 @@ public:
double y() const { return client_y(); }
i16 button() const { return m_button; }
u16 buttons() const { return m_buttons; }
virtual u32 which() const override { return m_button + 1; }
@ -54,6 +56,7 @@ private:
double m_client_x { 0 };
double m_client_y { 0 };
i16 m_button { 0 };
u16 m_buttons { 0 };
};
}

2
Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl
View file

@ -10,7 +10,7 @@ interface MouseEvent : UIEvent {
readonly attribute double y;
readonly attribute short button;
readonly attribute unsigned short buttons;
};
dictionary MouseEventInit : EventModifierInit {

4
Userland/Libraries/LibWeb/UIEvents/WheelEvent.cpp
View file

@ -28,13 +28,15 @@ WheelEvent* WheelEvent::create(JS::Realm& realm, FlyString const& event_name, Wh
return realm.heap().allocate<WheelEvent>(realm, realm, event_name, event_init);
}
WheelEvent* WheelEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, double delta_x, double delta_y)
WheelEvent* WheelEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, double delta_x, double delta_y, unsigned buttons, unsigned button)
{
WheelEventInit event_init {};
event_init.offset_x = offset_x;
event_init.offset_y = offset_y;
event_init.client_x = client_x;
event_init.client_y = client_y;
event_init.button = button;
event_init.buttons = buttons;
event_init.delta_x = delta_x;
event_init.delta_y = delta_y;
event_init.delta_mode = WheelDeltaMode::DOM_DELTA_PIXEL;

2
Userland/Libraries/LibWeb/UIEvents/WheelEvent.h
View file

@ -30,7 +30,7 @@ class WheelEvent final : public MouseEvent {
public:
static WheelEvent* create(JS::Realm&, FlyString const& event_name, WheelEventInit const& event_init = {});
static WheelEvent* create_from_platform_event(JS::Realm&, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, double delta_x, double delta_y);
static WheelEvent* create_from_platform_event(JS::Realm&, FlyString const& event_name, double offset_x, double offset_y, double client_x, double client_y, double delta_x, double delta_y, unsigned buttons, unsigned button);
virtual ~WheelEvent() override;