Browse Source

GlfwApplication: added new GLFW 3.4 resizing cursors.

pull/415/head
Marco Melorio 6 years ago
parent
commit
1b1c12a56f
  1. 8
      src/Magnum/Platform/GlfwApplication.cpp
  2. 26
      src/Magnum/Platform/GlfwApplication.h

8
src/Magnum/Platform/GlfwApplication.cpp

@ -710,8 +710,16 @@ constexpr Int CursorMap[] {
GLFW_ARROW_CURSOR,
GLFW_IBEAM_CURSOR,
GLFW_CROSSHAIR_CURSOR,
#if GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304
GLFW_RESIZE_NWSE_CURSOR,
GLFW_RESIZE_NESW_CURSOR,
#endif
GLFW_HRESIZE_CURSOR,
GLFW_VRESIZE_CURSOR,
#if GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304
GLFW_RESIZE_ALL_CURSOR,
GLFW_NOT_ALLOWED_CURSOR,
#endif
GLFW_HAND_CURSOR
};

26
src/Magnum/Platform/GlfwApplication.h

@ -561,8 +561,34 @@ class GlfwApplication {
Arrow, /**< Arrow */
TextInput, /**< Text input */
Crosshair, /**< Crosshair */
#if defined(DOXYGEN_GENERATING_OUTPUT) || GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304
/** Double arrow pointing northwest and southeast
* @note Supported since GLFW 3.4.
*/
ResizeNWSE,
/** Double arrow pointing northeast and southwest
* @note Supported since GLFW 3.4.
*/
ResizeNESW,
#endif
ResizeWE, /**< Double arrow pointing west and east */
ResizeNS, /**< Double arrow pointing north and south */
#if defined(DOXYGEN_GENERATING_OUTPUT) || GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304
/** Four pointed arrow pointing north, south, east, and west
* @note Supported since GLFW 3.4.
*/
ResizeAll,
/** Slashed circle or crossbones
* @note Supported since GLFW 3.4.
*/
No,
#endif
Hand, /**< Hand */
Hidden, /**< Hidden */
HiddenLocked /**< Hidden and locked */

Loading…
Cancel
Save