diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-06 21:04:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 21:04:11 -0300 |
| commit | 134b3edf5a34eb05322f064a9194c0ea81c39f6c (patch) | |
| tree | fc84a3e15c7ae3f8c8ea162a1ffb9f1471890956 /core/os/keyboard.cpp | |
| parent | 85945e4367c6c0759f855a3dfefe5941c3c07cd3 (diff) | |
| parent | 7b7c7c8dc0e3572a7d66d274b3e4db43695ce814 (diff) | |
Merge pull request #10123 from bojidar-bg/7695-key-kp-enter
Rename KEY_RETURN to KEY_ENTER and KEY_ENTER to KEY_KP_ENTER
Diffstat (limited to 'core/os/keyboard.cpp')
| -rw-r--r-- | core/os/keyboard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp index e154b1934d..9b3e376ea6 100644 --- a/core/os/keyboard.cpp +++ b/core/os/keyboard.cpp @@ -42,8 +42,8 @@ static const _KeyCodeText _keycodes[] = { {KEY_TAB ,"Tab"}, {KEY_BACKTAB ,"BackTab"}, {KEY_BACKSPACE ,"BackSpace"}, - {KEY_RETURN ,"Return"}, {KEY_ENTER ,"Enter"}, + {KEY_KP_ENTER ,"Kp Enter"}, {KEY_INSERT ,"Insert"}, {KEY_DELETE ,"Delete"}, {KEY_PAUSE ,"Pause"}, @@ -294,8 +294,8 @@ bool keycode_has_unicode(uint32_t p_keycode) { case KEY_TAB: case KEY_BACKTAB: case KEY_BACKSPACE: - case KEY_RETURN: case KEY_ENTER: + case KEY_KP_ENTER: case KEY_INSERT: case KEY_DELETE: case KEY_PAUSE: |