diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 16:51:10 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 16:51:10 +0200 |
| commit | 41db10a8ae6702709343b6b2cd38b0f5497cce38 (patch) | |
| tree | 8079abc338e6bca21946ff7d06e4d004239cf4f8 | |
| parent | b5e0729fcd21a63fc71fe2f37804a02c1d446e40 (diff) | |
| parent | b697de92efab8ddd9796a1f396cebfb159be11b0 (diff) | |
Merge pull request #4621 from marcelofg55/master
OS.get_screen_size now returns the correct value on OSX
| -rw-r--r-- | platform/osx/os_osx.h | 2 | ||||
| -rw-r--r-- | 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 29c652051a..d88dd89002 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 c814932dc4..c443fc2d0e 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; |