lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Really fix enter keys confusion...

Browse source
This commit is contained in:
Elias Daler 2018-04-07 22:53:45 +03:00 committed by Lukas Dürrenberger
parent 2ca993e96e
commit c99611a226
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/SFML/Window/Unix/KeyboardImpl.cpp
View file

@ -75,7 +75,7 @@ sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
case XK_KP_Separator: case XK_KP_Separator:
case XK_KP_Decimal: return sf::Keyboard::ScanDecimal; case XK_KP_Decimal: return sf::Keyboard::ScanDecimal;
case XK_KP_Equal: return sf::Keyboard::ScanPadEquals; case XK_KP_Equal: return sf::Keyboard::ScanPadEquals;
case XK_KP_Enter: return sf::Keyboard::ScanEnter; case XK_KP_Enter: return sf::Keyboard::ScanReturn;
default: break; default: break;
} }
@ -107,7 +107,7 @@ sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
case XK_Pause: return sf::Keyboard::ScanPause; case XK_Pause: return sf::Keyboard::ScanPause;
case XK_Delete: return sf::Keyboard::ScanDelete; case XK_Delete: return sf::Keyboard::ScanDelete;
case XK_BackSpace: return sf::Keyboard::ScanBackspace; case XK_BackSpace: return sf::Keyboard::ScanBackspace;
case XK_Return: return sf::Keyboard::ScanReturn; case XK_Return: return sf::Keyboard::ScanEnter;
case XK_Home: return sf::Keyboard::ScanHome; case XK_Home: return sf::Keyboard::ScanHome;
case XK_End: return sf::Keyboard::ScanEnd; case XK_End: return sf::Keyboard::ScanEnd;
case XK_Page_Up: return sf::Keyboard::ScanPageUp; case XK_Page_Up: return sf::Keyboard::ScanPageUp;
@ -457,7 +457,7 @@ String KeyboardImpl::getDescription(Keyboard::Scancode code)
// Fallback to our best guess for the keys that are known to be independent of the layout. // Fallback to our best guess for the keys that are known to be independent of the layout.
switch (code) switch (code)
{ {
case Keyboard::ScanReturn: return "Enter"; case Keyboard::ScanEnter: return "Enter";
case Keyboard::ScanEscape: return "Escape"; case Keyboard::ScanEscape: return "Escape";
case Keyboard::ScanBackspace: return "Backspace"; case Keyboard::ScanBackspace: return "Backspace";
case Keyboard::ScanTab: return "Tab"; case Keyboard::ScanTab: return "Tab";
@ -502,7 +502,7 @@ String KeyboardImpl::getDescription(Keyboard::Scancode code)
case Keyboard::ScanMinus: return "Minux (Numpad)"; case Keyboard::ScanMinus: return "Minux (Numpad)";
case Keyboard::ScanPlus: return "Plus (Numpad)"; case Keyboard::ScanPlus: return "Plus (Numpad)";
case Keyboard::ScanPadEquals: return "Equals (Numpad)"; case Keyboard::ScanPadEquals: return "Equals (Numpad)";
case Keyboard::ScanEnter: return "Enter (Numpad)"; case Keyboard::ScanReturn: return "Enter (Numpad)";
case Keyboard::ScanDecimal: return "Decimal (Numpad)"; case Keyboard::ScanDecimal: return "Decimal (Numpad)";
case Keyboard::ScanNumpad0: return "0 (Numpad)"; case Keyboard::ScanNumpad0: return "0 (Numpad)";