From c94c4621877b3daaf64e67df53ce783aad4883a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2020 18:07:38 +0100 Subject: [PATCH] Doc++, updated changelog. --- doc/changelog.dox | 3 ++- src/Magnum/Platform/GlfwApplication.h | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index a0dc2998e..e3c8791a3 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -76,7 +76,8 @@ See also: - Cursor management using @ref Platform::Sdl2Application::setCursor(), @ref Platform::GlfwApplication::setCursor() and @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 @ref Platform::Sdl2Application::setWindowSize() - Window icon management using @ref Platform::Sdl2Application::setWindowIcon() diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 5395937d9..cd525df6d 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -563,13 +563,15 @@ class GlfwApplication { 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. + /** + * Double arrow pointing northwest and southeast + * @note Available since GLFW 3.4. */ 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, #endif @@ -578,13 +580,15 @@ class GlfwApplication { 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. + /** + * Four pointed arrow pointing north, south, east, and west + * @note Available since GLFW 3.4. */ ResizeAll, - /** Slashed circle or crossbones - * @note Supported since GLFW 3.4. + /** + * Slashed circle or crossbones + * @note Available since GLFW 3.4. */ No, #endif