From 02fae575ca51e6ddaa40ea7415b13f7fd2672bbf Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Thu, 1 Aug 2024 12:45:41 -0400 Subject: [PATCH] LibWeb: Define a helper constant for the platform ctrl-ish key For all intents and purposes, the cmd (super) key on macOS should be treated as the ctrl key. (cherry picked from commit 71b25e3e5a70937f1e2031b94541c04a68d28efa; amended to fix minor conflict) --- Kernel/API/KeyCode.h | 7 +++++++ Userland/Libraries/LibWeb/UIEvents/MouseEvent.h | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/Kernel/API/KeyCode.h b/Kernel/API/KeyCode.h index d05a24563ac..26a1e0b941a 100644 --- a/Kernel/API/KeyCode.h +++ b/Kernel/API/KeyCode.h @@ -7,6 +7,7 @@ #pragma once #include +#include #include #define ENUMERATE_KEY_CODES \ @@ -166,6 +167,12 @@ enum KeyModifier { Mod_Mask = Mod_Alt | Mod_Ctrl | Mod_Shift | Mod_Super | Mod_AltGr | Mod_Keypad, Is_Press = 0x80, + +#if defined(AK_OS_MACOS) + Mod_PlatformCtrl = Mod_Super, +#else + Mod_PlatformCtrl = Mod_Ctrl, +#endif }; AK_ENUM_BITWISE_OPERATORS(KeyModifier); diff --git a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h index a4b9ec9b973..ec969f3f43a 100644 --- a/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h +++ b/Userland/Libraries/LibWeb/UIEvents/MouseEvent.h @@ -56,6 +56,15 @@ public: bool alt_key() const { return m_alt_key; } bool meta_key() const { return m_meta_key; } + bool platform_ctrl_key() const + { +#if defined(AK_OS_MACOS) + return meta_key(); +#else + return ctrl_key(); +#endif + } + double movement_x() const { return m_movement_x; } double movement_y() const { return m_movement_y; }