From 25d0bb876873a50c66373f9a71ea22946e64297a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 19 Aug 2018 18:28:43 +0200
Subject: [PATCH] Platform: {Android,Glfw}Application: consistent windowSize()
 with SDL.

Not providing framebufferSize() or dpiScaling() there yet, as that's a
bit involved in both cases. Support will be added, eventually.
---
 src/Magnum/Platform/AndroidApplication.cpp | 2 +-
 src/Magnum/Platform/AndroidApplication.h   | 4 +++-
 src/Magnum/Platform/GlfwApplication.cpp    | 2 +-
 src/Magnum/Platform/GlfwApplication.h      | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp
index 59ddd9cd2..48df834a7 100644
--- a/src/Magnum/Platform/AndroidApplication.cpp
+++ b/src/Magnum/Platform/AndroidApplication.cpp
@@ -165,7 +165,7 @@ bool AndroidApplication::tryCreate(const Configuration& configuration, const GLC
     return _context->tryCreate();
 }
 
-Vector2i AndroidApplication::windowSize() {
+Vector2i AndroidApplication::windowSize() const {
     return {ANativeWindow_getWidth(_state->window),
             ANativeWindow_getHeight(_state->window)};
 }
diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h
index 102bb663d..ceea514e1 100644
--- a/src/Magnum/Platform/AndroidApplication.h
+++ b/src/Magnum/Platform/AndroidApplication.h
@@ -300,13 +300,15 @@ class AndroidApplication {
 
         /** @{ @name Screen handling */
 
+    public:
         /**
          * @brief Window size
          *
          * Window size to which all input event coordinates can be related.
          */
-        Vector2i windowSize();
+        Vector2i windowSize() const;
 
+    protected:
         /**
          * @brief Swap buffers
          *
diff --git a/src/Magnum/Platform/GlfwApplication.cpp b/src/Magnum/Platform/GlfwApplication.cpp
index 122c0c5e7..0fa165605 100644
--- a/src/Magnum/Platform/GlfwApplication.cpp
+++ b/src/Magnum/Platform/GlfwApplication.cpp
@@ -424,7 +424,7 @@ GlfwApplication::~GlfwApplication() {
     glfwTerminate();
 }
 
-Vector2i GlfwApplication::windowSize() {
+Vector2i GlfwApplication::windowSize() const {
     Vector2i size;
     glfwGetWindowSize(_window, &size.x(), &size.y());
     return size;
diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h
index e86b3c033..7e89a871a 100644
--- a/src/Magnum/Platform/GlfwApplication.h
+++ b/src/Magnum/Platform/GlfwApplication.h
@@ -330,7 +330,7 @@ class GlfwApplication {
 
         /** @{ @name Screen handling */
 
-        #ifndef CORRADE_TARGET_EMSCRIPTEN
+    public:
         /**
          * @brief Window size
          *
@@ -338,9 +338,9 @@ class GlfwApplication {
          * Note that especially on HiDPI systems the reported window size might
          * not be the same as framebuffer size.
          */
-        Vector2i windowSize();
-        #endif
+        Vector2i windowSize() const;
 
+    protected:
         /**
          * @brief Swap buffers
          *