RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:47:44 +00:00
Code Issues Activity Actions

LibGUI: Allow Shortcuts to have a mouse button associated with them

Browse source 
A Shortcut can now be either have a keyboard key, or a mouse button,
along with any modifiers.

Decided to add an extra type field instead of subclassing, which means
callers will have to be a little careful before accessing a particular
input method's "key", but it keeps things simple for now.
This commit is contained in:
Geordie Hall 2022-02-05 18:04:12 +11:00 • committed by Linus Groh
parent 8b9b836a0e
commit a252c3e058
2 changed files with 62 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGUI/Shortcut.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Geordie Hall <me@geordiehall.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -24,10 +25,17 @@ String Shortcut::to_string() const
if (m_modifiers & Mod_Super)
parts.append("Super");
if (auto* key_name = key_code_to_string(m_key))
parts.append(key_name);
else
parts.append("(Invalid)");
if (m_type == Type::Keyboard) {
if (auto* key_name = key_code_to_string(m_keyboard_key))
parts.append(key_name);
else
parts.append("(Invalid)");
} else {
if (m_mouse_button != MouseButton::None)
parts.append(String::formatted("Mouse {}", mouse_button_to_string(m_mouse_button)));
else
parts.append("(Invalid)");
}
StringBuilder builder;
builder.join('+', parts);