mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename Key::Tilde to Key::Grave

Browse Source
This commit is contained in:
kimci86 2022-12-20 21:55:09 +01:00 committed by Lukas Dürrenberger
parent 722838d590
commit 752955c6f8
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/SFML/Window/Keyboard.hpp
View File

@ -108,7 +108,7 @@ public:
Apostrophe, //!< The ' key
Slash, //!< The / key
Backslash, //!< The \ key
Tilde, //!< The ~ key
Grave, //!< The ` key
Equal, //!< The = key
Hyphen, //!< The - key (hyphen)
Space, //!< The Space key
@ -160,6 +160,7 @@ public:
// Deprecated values:
Tilde = Grave, //!< \deprecated Use Grave instead
Dash = Hyphen, //!< \deprecated Use Hyphen instead
BackSpace = Backspace, //!< \deprecated Use Backspace instead
BackSlash = Backslash, //!< \deprecated Use Backslash instead

2
src/SFML/Window/Android/WindowImplAndroid.cpp
View File

@ -633,7 +633,7 @@ Keyboard::Key WindowImplAndroid::androidKeyToSF(int32_t key)
case AKEYCODE_ENTER: return Keyboard::Enter;
case AKEYCODE_DEL: return Keyboard::Backspace;
case AKEYCODE_FORWARD_DEL: return Keyboard::Delete;
case AKEYCODE_GRAVE: return Keyboard::Tilde;
case AKEYCODE_GRAVE: return Keyboard::Grave;
case AKEYCODE_MINUS: return Keyboard::Subtract;
case AKEYCODE_EQUALS: return Keyboard::Equal;
case AKEYCODE_LEFT_BRACKET: return Keyboard::LBracket;

2
src/SFML/Window/DRM/InputImplUDev.cpp
View File

@ -218,7 +218,7 @@ namespace
case KEY_L: return sf::Keyboard::L;
case KEY_SEMICOLON: return sf::Keyboard::Semicolon;
case KEY_APOSTROPHE: return sf::Keyboard::Quote;
case KEY_GRAVE: return sf::Keyboard::Tilde;
case KEY_GRAVE: return sf::Keyboard::Grave;
case KEY_LEFTSHIFT: return sf::Keyboard::LShift;
case KEY_BACKSLASH: return sf::Keyboard::Backslash;
case KEY_Z: return sf::Keyboard::Z;

4
src/SFML/Window/OSX/HIDInputManager.mm
View File

@ -182,7 +182,7 @@ Keyboard::Key HIDInputManager::localizedKey(UniChar ch)
case 0x27: return Keyboard::Apostrophe;
case 0x2f: return Keyboard::Slash;
case 0x5c: return Keyboard::Backslash;
case 0x7e: return Keyboard::Tilde;
case 0x60: return Keyboard::Grave;
case 0x3d: return Keyboard::Equal;
case 0x2d: return Keyboard::Hyphen;
case 0x20: return Keyboard::Space;
@ -310,7 +310,7 @@ UniChar HIDInputManager::toUnicode(Keyboard::Key key)
case Keyboard::Apostrophe: return 0x27;
case Keyboard::Slash: return 0x2f;
case Keyboard::Backslash: return 0x5c;
case Keyboard::Tilde: return 0x7e;
case Keyboard::Grave: return 0x60;
case Keyboard::Equal: return 0x3d;
case Keyboard::Hyphen: return 0x2d;
case Keyboard::Space: return 0x20;

4
src/SFML/Window/Unix/KeySymToKeyMapping.cpp
View File

@ -59,7 +59,7 @@ Keyboard::Key keySymToKey(KeySym symbol)
case XK_period: return Keyboard::Period;
case XK_apostrophe: return Keyboard::Quote;
case XK_backslash: return Keyboard::BackSlash;
case XK_grave: return Keyboard::Tilde;
case XK_grave: return Keyboard::Grave;
case XK_space: return Keyboard::Space;
case XK_Return: return Keyboard::Return;
case XK_KP_Enter: return Keyboard::Return;
@ -172,7 +172,7 @@ KeySym keyToKeySym(Keyboard::Key key)
case Keyboard::Period: return XK_period;
case Keyboard::Quote: return XK_apostrophe;
case Keyboard::BackSlash: return XK_backslash;
case Keyboard::Tilde: return XK_grave;
case Keyboard::Grave: return XK_grave;
case Keyboard::Space: return XK_space;
case Keyboard::Return: return XK_Return;
case Keyboard::BackSpace: return XK_BackSpace;

4
src/SFML/Window/Win32/InputImpl.cpp
View File

@ -106,7 +106,7 @@ Keyboard::Key virtualKeyToSfKey(UINT virtualKey)
case VK_OEM_7: key = Keyboard::Apostrophe; break;
case VK_OEM_2: key = Keyboard::Slash; break;
case VK_OEM_5: key = Keyboard::Backslash; break;
case VK_OEM_3: key = Keyboard::Tilde; break;
case VK_OEM_3: key = Keyboard::Grave; break;
case VK_OEM_PLUS: key = Keyboard::Equal; break;
case VK_OEM_MINUS: key = Keyboard::Hyphen; break;
case VK_SPACE: key = Keyboard::Space; break;
@ -218,7 +218,7 @@ int sfKeyToVirtualKey(Keyboard::Key key)
case Keyboard::Apostrophe: virtualKey = VK_OEM_7; break;
case Keyboard::Slash: virtualKey = VK_OEM_2; break;
case Keyboard::Backslash: virtualKey = VK_OEM_5; break;
case Keyboard::Tilde: virtualKey = VK_OEM_3; break;
case Keyboard::Grave: virtualKey = VK_OEM_3; break;
case Keyboard::Equal: virtualKey = VK_OEM_PLUS; break;
case Keyboard::Hyphen: virtualKey = VK_OEM_MINUS; break;
case Keyboard::Space: virtualKey = VK_SPACE; break;

2
src/SFML/Window/Win32/WindowImplWin32.cpp
View File

@ -1169,7 +1169,7 @@ Keyboard::Key WindowImplWin32::virtualKeyCodeToSF(WPARAM key, LPARAM flags)
case VK_OEM_PERIOD: return Keyboard::Period;
case VK_OEM_7: return Keyboard::Apostrophe;
case VK_OEM_5: return Keyboard::Backslash;
case VK_OEM_3: return Keyboard::Tilde;
case VK_OEM_3: return Keyboard::Grave;
case VK_ESCAPE: return Keyboard::Escape;
case VK_SPACE: return Keyboard::Space;
case VK_RETURN: return Keyboard::Enter;