From ed7eac0b42a598dff8984830e7f943dd6af07deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 15 Jun 2017 09:25:48 +0200 Subject: [PATCH] Platform: implement Sdl2Application::windowSize() on Emscripten. --- src/Magnum/Platform/Sdl2Application.cpp | 6 ++++-- src/Magnum/Platform/Sdl2Application.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index 28b5160e8..a6465be1b 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -268,13 +268,15 @@ bool Sdl2Application::tryCreateContext(const Configuration& configuration) { return true; } -#ifndef CORRADE_TARGET_EMSCRIPTEN Vector2i Sdl2Application::windowSize() { + #ifndef CORRADE_TARGET_EMSCRIPTEN Vector2i size; SDL_GetWindowSize(_window, &size.x(), &size.y()); return size; + #else + return {_glContext->w, _glContext->h}; + #endif } -#endif void Sdl2Application::swapBuffers() { #ifndef CORRADE_TARGET_EMSCRIPTEN diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 99c3174bf..b15fb8484 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -458,17 +458,14 @@ class Sdl2Application { /** @{ @name Screen handling */ - #ifndef CORRADE_TARGET_EMSCRIPTEN /** * @brief Window size * * Window size to which all input event coordinates can be related. * Note that especially on HiDPI systems the reported window size might * not be the same as framebuffer size. - * @note Not available in @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". */ Vector2i windowSize(); - #endif /** * @brief Swap buffers