godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add CMD_OR_CTRL as a Key and not just a key modifier

This commit is contained in:
ajreckof 2022-08-07 00:30:56 +01:00
parent a51ca2beaf
commit 4309dffc6a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/keyboard.cpp
View File

@ -63,12 +63,15 @@ static const _KeyCodeText _keycodes[] = {
{Key::CTRL ,"Ctrl"}, {Key::CTRL ,"Ctrl"},
#if defined(MACOS_ENABLED) #if defined(MACOS_ENABLED)
{Key::META ,"Command"}, {Key::META ,"Command"},
{Key::CMD_OR_CTRL ,"Command"},
{Key::ALT ,"Option"}, {Key::ALT ,"Option"},
#elif defined(WINDOWS_ENABLED) #elif defined(WINDOWS_ENABLED)
{Key::META ,"Windows"}, {Key::META ,"Windows"},
{Key::CMD_OR_CTRL ,"Ctrl"},
{Key::ALT ,"Alt"}, {Key::ALT ,"Alt"},
#else #else
{Key::META ,"Meta"}, {Key::META ,"Meta"},
{Key::CMD_OR_CTRL ,"Ctrl"},
{Key::ALT ,"Alt"}, {Key::ALT ,"Alt"},
#endif #endif
{Key::CAPSLOCK ,"CapsLock"}, {Key::CAPSLOCK ,"CapsLock"},

5
core/os/keyboard.h
View File

@ -65,6 +65,11 @@ enum class Key {
SHIFT = SPECIAL | 0x15, SHIFT = SPECIAL | 0x15,
CTRL = SPECIAL | 0x16, CTRL = SPECIAL | 0x16,
META = SPECIAL | 0x17, META = SPECIAL | 0x17,
#if defined(MACOS_ENABLED)
CMD_OR_CTRL = META,
#else
CMD_OR_CTRL = CTRL,
#endif
ALT = SPECIAL | 0x18, ALT = SPECIAL | 0x18,
CAPSLOCK = SPECIAL | 0x19, CAPSLOCK = SPECIAL | 0x19,
NUMLOCK = SPECIAL | 0x1A, NUMLOCK = SPECIAL | 0x1A,