summaryrefslogtreecommitdiff
path: root/platform/osx/os_osx.h
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-05-11 16:51:10 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-05-11 16:51:10 +0200
commit41db10a8ae6702709343b6b2cd38b0f5497cce38 (patch)
tree8079abc338e6bca21946ff7d06e4d004239cf4f8 /platform/osx/os_osx.h
parentb5e0729fcd21a63fc71fe2f37804a02c1d446e40 (diff)
parentb697de92efab8ddd9796a1f396cebfb159be11b0 (diff)
Merge pull request #4621 from marcelofg55/master
OS.get_screen_size now returns the correct value on OSX
Diffstat (limited to 'platform/osx/os_osx.h')
-rw-r--r--platform/osx/os_osx.h2
1 files changed, 1 insertions, 1 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();