Browse Source

Doc++, updated changelog.

pull/417/head
Vladimír Vondruš 6 years ago
parent
commit
c94c462187
  1. 3
      doc/changelog.dox
  2. 20
      src/Magnum/Platform/GlfwApplication.h

3
doc/changelog.dox

@ -76,7 +76,8 @@ See also:
- Cursor management using @ref Platform::Sdl2Application::setCursor(), - Cursor management using @ref Platform::Sdl2Application::setCursor(),
@ref Platform::GlfwApplication::setCursor() and @ref Platform::GlfwApplication::setCursor() and
@ref Platform::EmscriptenApplication::setCursor() (see @ref Platform::EmscriptenApplication::setCursor() (see
[mosra/magnum#383](https://github.com/mosra/magnum/pull/383)) [mosra/magnum#383](https://github.com/mosra/magnum/pull/383) and
[mosra/magnum#415](https://github.com/mosra/magnum/pull/415))
- Added @ref Platform::GlfwApplication::setWindowSize() and - Added @ref Platform::GlfwApplication::setWindowSize() and
@ref Platform::Sdl2Application::setWindowSize() @ref Platform::Sdl2Application::setWindowSize()
- Window icon management using @ref Platform::Sdl2Application::setWindowIcon() - Window icon management using @ref Platform::Sdl2Application::setWindowIcon()

20
src/Magnum/Platform/GlfwApplication.h

@ -563,13 +563,15 @@ class GlfwApplication {
Crosshair, /**< Crosshair */ Crosshair, /**< Crosshair */
#if defined(DOXYGEN_GENERATING_OUTPUT) || GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304 #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. * Double arrow pointing northwest and southeast
* @note Available since GLFW 3.4.
*/ */
ResizeNWSE, ResizeNWSE,
/** Double arrow pointing northeast and southwest /**
* @note Supported since GLFW 3.4. * Double arrow pointing northeast and southwest
* @note Available since GLFW 3.4.
*/ */
ResizeNESW, ResizeNESW,
#endif #endif
@ -578,13 +580,15 @@ class GlfwApplication {
ResizeNS, /**< Double arrow pointing north and south */ ResizeNS, /**< Double arrow pointing north and south */
#if defined(DOXYGEN_GENERATING_OUTPUT) || GLFW_VERSION_MAJOR*100 + GLFW_VERSION_MINOR >= 304 #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. * Four pointed arrow pointing north, south, east, and west
* @note Available since GLFW 3.4.
*/ */
ResizeAll, ResizeAll,
/** Slashed circle or crossbones /**
* @note Supported since GLFW 3.4. * Slashed circle or crossbones
* @note Available since GLFW 3.4.
*/ */
No, No,
#endif #endif

Loading…
Cancel
Save