From 2bd6e2402bbfbadca5f93f0cf4f482edf3f55dc4 Mon Sep 17 00:00:00 2001 From: marcelofg55 Date: Wed, 11 May 2016 11:44:10 -0300 Subject: [PATCH] OS.get_screen_size now returns the correct value on OSX (cherry picked from commit b697de92efab8ddd9796a1f396cebfb159be11b0) --- platform/osx/os_osx.h | 2 +- platform/osx/os_osx.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 29c652051af..d88dd890027 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -184,7 +184,7 @@ public: virtual bool is_window_minimized() const; virtual void set_window_maximized(bool p_enabled); virtual bool is_window_maximized() const; - Size2 get_screen_size(int p_screen); + Size2 get_screen_size(int p_screen=0) const; void run(); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 6af2f347aad..8702842fe6b 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1354,7 +1354,7 @@ Point2 OS_OSX::get_screen_position(int p_screen) const { return screens[p_screen].pos; }; -Size2 OS_OSX::get_screen_size(int p_screen) { +Size2 OS_OSX::get_screen_size(int p_screen) const { ERR_FAIL_INDEX_V(p_screen, screens.size(), Point2()); return screens[p_screen].size;