Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 20:23:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1565 from romulox-x/osx_wm_fix

Browse Source 
fixed build error on OSX from new WM code
This commit is contained in:
Juan Linietsky 2015-03-24 09:49:03 -03:00
commit ba194115bc
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/osx/os_osx.h
View File

@ -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);

4
platform/osx/os_osx.mm
View File

@ -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];