diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-03-24 09:49:03 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-24 09:49:03 -0300 |
| commit | ba194115bc3e450ac653191b2fc52b89417ddc28 (patch) | |
| tree | af16adefea04bc096855c267933b04943d97a0f6 /platform/osx | |
| parent | f35315fee24ade08a48451a6a596df60fa5ea9cb (diff) | |
| parent | a6f6bd85f982f7b24b71238de302bc534e3d4658 (diff) | |
Merge pull request #1565 from romulox-x/osx_wm_fix
fixed build error on OSX from new WM code
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 24f7115938..8f121b7dd5 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -133,6 +133,8 @@ public: virtual Point2 get_mouse_pos() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String& p_title); + + virtual Size2 get_window_size() const; virtual void set_icon(const Image& p_icon); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 1c0d1f9991..55ef6c1516 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1245,6 +1245,10 @@ void OS_OSX::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) cons } +Size2 OS_OSX::get_window_size() const { + return Vector2(current_videomode.width, current_videomode.height); +} + void OS_OSX::move_window_to_foreground() { [window_object orderFrontRegardless]; |