Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13603 from perminovVS/correct-key-code 

Desktop and WinRT use correct keyboard codes
This commit is contained in:
pandamicro 2015-09-04 14:39:44 +08:00
parent 7fb36b4c9c b5688f504c
commit f9c20caa67
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/platform/desktop/CCGLViewImpl-desktop.cpp
View File

@ -186,7 +186,7 @@ static keyCodeItem g_keyCodeStructArray[] = {
/* Function keys */ /* Function keys */
{ GLFW_KEY_ESCAPE , EventKeyboard::KeyCode::KEY_ESCAPE }, { GLFW_KEY_ESCAPE , EventKeyboard::KeyCode::KEY_ESCAPE },
{ GLFW_KEY_ENTER , EventKeyboard::KeyCode::KEY_KP_ENTER }, { GLFW_KEY_ENTER , EventKeyboard::KeyCode::KEY_ENTER },
{ GLFW_KEY_TAB , EventKeyboard::KeyCode::KEY_TAB }, { GLFW_KEY_TAB , EventKeyboard::KeyCode::KEY_TAB },
{ GLFW_KEY_BACKSPACE , EventKeyboard::KeyCode::KEY_BACKSPACE }, { GLFW_KEY_BACKSPACE , EventKeyboard::KeyCode::KEY_BACKSPACE },
{ GLFW_KEY_INSERT , EventKeyboard::KeyCode::KEY_INSERT }, { GLFW_KEY_INSERT , EventKeyboard::KeyCode::KEY_INSERT },
@ -195,9 +195,9 @@ static keyCodeItem g_keyCodeStructArray[] = {
{ GLFW_KEY_LEFT , EventKeyboard::KeyCode::KEY_LEFT_ARROW }, { GLFW_KEY_LEFT , EventKeyboard::KeyCode::KEY_LEFT_ARROW },
{ GLFW_KEY_DOWN , EventKeyboard::KeyCode::KEY_DOWN_ARROW }, { GLFW_KEY_DOWN , EventKeyboard::KeyCode::KEY_DOWN_ARROW },
{ GLFW_KEY_UP , EventKeyboard::KeyCode::KEY_UP_ARROW }, { GLFW_KEY_UP , EventKeyboard::KeyCode::KEY_UP_ARROW },
{ GLFW_KEY_PAGE_UP , EventKeyboard::KeyCode::KEY_KP_PG_UP }, { GLFW_KEY_PAGE_UP , EventKeyboard::KeyCode::KEY_PG_UP },
{ GLFW_KEY_PAGE_DOWN , EventKeyboard::KeyCode::KEY_KP_PG_DOWN }, { GLFW_KEY_PAGE_DOWN , EventKeyboard::KeyCode::KEY_PG_DOWN },
{ GLFW_KEY_HOME , EventKeyboard::KeyCode::KEY_KP_HOME }, { GLFW_KEY_HOME , EventKeyboard::KeyCode::KEY_HOME },
{ GLFW_KEY_END , EventKeyboard::KeyCode::KEY_END }, { GLFW_KEY_END , EventKeyboard::KeyCode::KEY_END },
{ GLFW_KEY_CAPS_LOCK , EventKeyboard::KeyCode::KEY_CAPS_LOCK }, { GLFW_KEY_CAPS_LOCK , EventKeyboard::KeyCode::KEY_CAPS_LOCK },
{ GLFW_KEY_SCROLL_LOCK , EventKeyboard::KeyCode::KEY_SCROLL_LOCK }, { GLFW_KEY_SCROLL_LOCK , EventKeyboard::KeyCode::KEY_SCROLL_LOCK },

6
cocos/platform/winrt/Keyboard-winrt.cpp
View File

@ -117,9 +117,9 @@ static keyCodeItem g_keyCodeStructArray [] = {
{ (int) VirtualKey::Left, EventKeyboard::KeyCode::KEY_LEFT_ARROW }, { (int) VirtualKey::Left, EventKeyboard::KeyCode::KEY_LEFT_ARROW },
{ (int) VirtualKey::Down, EventKeyboard::KeyCode::KEY_DOWN_ARROW }, { (int) VirtualKey::Down, EventKeyboard::KeyCode::KEY_DOWN_ARROW },
{ (int) VirtualKey::Up, EventKeyboard::KeyCode::KEY_UP_ARROW }, { (int) VirtualKey::Up, EventKeyboard::KeyCode::KEY_UP_ARROW },
{ VK_PRIOR, EventKeyboard::KeyCode::KEY_KP_PG_UP }, { VK_PRIOR, EventKeyboard::KeyCode::KEY_PG_UP },
{ VK_NEXT, EventKeyboard::KeyCode::KEY_KP_PG_DOWN }, { VK_NEXT, EventKeyboard::KeyCode::KEY_PG_DOWN },
{ VK_HOME, EventKeyboard::KeyCode::KEY_KP_HOME }, { VK_HOME, EventKeyboard::KeyCode::KEY_HOME },
{ VK_END, EventKeyboard::KeyCode::KEY_END }, { VK_END, EventKeyboard::KeyCode::KEY_END },
{ VK_CAPITAL, EventKeyboard::KeyCode::KEY_CAPS_LOCK }, { VK_CAPITAL, EventKeyboard::KeyCode::KEY_CAPS_LOCK },
{ VK_SCROLL, EventKeyboard::KeyCode::KEY_SCROLL_LOCK }, { VK_SCROLL, EventKeyboard::KeyCode::KEY_SCROLL_LOCK },