diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-30 23:36:46 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-30 23:36:46 -0300 |
| commit | cf57a654d7d09fe169455ffc2049cd4bfec660f3 (patch) | |
| tree | 3b72d5e7d8b5c8eddddef09b924546c60c9c200d /platform/osx | |
| parent | 2d8866574dd2c06ac03e7055642b917a0a3c6dac (diff) | |
new editor settings customization of where to run the game from the editor
Diffstat (limited to 'platform/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 144037b1cb..869997f190 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -170,7 +170,7 @@ public: virtual int get_screen_count() const; virtual int get_current_screen() const; virtual void set_current_screen(int p_screen); - virtual Point2 get_screen_position(int p_screen=0); + virtual Point2 get_screen_position(int p_screen=0) const; virtual Point2 get_window_position() const; virtual void set_window_position(const Point2& p_position); virtual void set_window_size(const Size2 p_size); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 72699366c4..abfe42beda 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1279,7 +1279,7 @@ void OS_OSX::set_current_screen(int p_screen) { current_screen = p_screen; }; -Point2 OS_OSX::get_screen_position(int p_screen) { +Point2 OS_OSX::get_screen_position(int p_screen) const { ERR_FAIL_INDEX_V(p_screen, screens.size(), Point2()); return screens[p_screen].pos; |