diff --git a/doc/changelog.dox b/doc/changelog.dox index ceaffb318..351a37d32 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -125,6 +125,8 @@ See also: to @ref Platform::Sdl2Application, @ref Platform::GlfwApplication and @ref Platform::AndroidApplication. This also makes the default framebuffer parameters consistent across the implementations. +- Added numpad keys to @ref Platform::Sdl2Application::KeyEvent::Key, + consistent with GLFW key mapping @subsubsection changelog-latest-new-primitives Primitives library diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index b1ad234ed..c9c7adf56 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -1346,12 +1346,13 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent { Y = GLFW_KEY_Y, /**< Letter Y */ Z = GLFW_KEY_Z, /**< Letter Z */ - /* Function keys */ CapsLock = GLFW_KEY_CAPS_LOCK, /**< Caps lock */ ScrollLock = GLFW_KEY_SCROLL_LOCK, /**< Scroll lock */ NumLock = GLFW_KEY_NUM_LOCK, /**< Num lock */ PrintScreen = GLFW_KEY_PRINT_SCREEN,/**< Print screen */ Pause = GLFW_KEY_PAUSE, /**< Pause */ + Menu = GLFW_KEY_MENU, /**< Menu */ + NumZero = GLFW_KEY_KP_0, /**< Numpad zero */ NumOne = GLFW_KEY_KP_1, /**< Numpad one */ NumTwo = GLFW_KEY_KP_2, /**< Numpad two */ @@ -1368,8 +1369,7 @@ class GlfwApplication::KeyEvent: public GlfwApplication::InputEvent { NumSubtract = GLFW_KEY_KP_SUBTRACT, /**< Numpad subtract */ NumAdd = GLFW_KEY_KP_ADD, /**< Numpad add */ NumEnter = GLFW_KEY_KP_ENTER, /**< Numpad enter */ - NumEqual = GLFW_KEY_KP_EQUAL, /**< Numpad equal */ - Menu = GLFW_KEY_MENU /**< Menu */ + NumEqual = GLFW_KEY_KP_EQUAL /**< Numpad equal */ }; #if defined(DOXYGEN_GENERATING_OUTPUT) || GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 302 diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index a047ab08a..a2a8df49e 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -1843,7 +1843,25 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent { W = SDLK_w, /**< Letter W */ X = SDLK_x, /**< Letter X */ Y = SDLK_y, /**< Letter Y */ - Z = SDLK_z /**< Letter Z */ + Z = SDLK_z, /**< Letter Z */ + + NumZero = SDLK_KP_0, /**< Numpad zero */ + NumOne = SDLK_KP_1, /**< Numpad one */ + NumTwo = SDLK_KP_2, /**< Numpad two */ + NumThree = SDLK_KP_3, /**< Numpad three */ + NumFour = SDLK_KP_4, /**< Numpad four */ + NumFive = SDLK_KP_5, /**< Numpad five */ + NumSix = SDLK_KP_6, /**< Numpad six */ + NumSeven = SDLK_KP_7, /**< Numpad seven */ + NumEight = SDLK_KP_8, /**< Numpad eight */ + NumNine = SDLK_KP_9, /**< Numpad nine */ + NumDecimal = SDLK_KP_DECIMAL, /**< Numpad decimal */ + NumDivide = SDLK_KP_DIVIDE, /**< Numpad divide */ + NumMultiply = SDLK_KP_MULTIPLY, /**< Numpad multiply */ + NumSubtract = SDLK_KP_MINUS, /**< Numpad subtract */ + NumAdd = SDLK_KP_PLUS, /**< Numpad add */ + NumEnter = SDLK_KP_ENTER, /**< Numpad enter */ + NumEqual = SDLK_KP_EQUALS /**< Numpad equal */ }; /**