godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OS.get_screen_size now returns the correct value on OSX 

(cherry picked from commit b697de92ef)
This commit is contained in:
marcelofg55 2016-05-11 11:44:10 -03:00 committed by Rémi Verschelde
parent c575f31d5d
commit 2bd6e2402b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/osx/os_osx.h
View File

@ -184,7 +184,7 @@ public:
virtual bool is_window_minimized() const; virtual bool is_window_minimized() const;
virtual void set_window_maximized(bool p_enabled); virtual void set_window_maximized(bool p_enabled);
virtual bool is_window_maximized() const; virtual bool is_window_maximized() const;
Size2 get_screen_size(int p_screen); Size2 get_screen_size(int p_screen=0) const;
void run(); void run();

2
platform/osx/os_osx.mm
View File

@ -1354,7 +1354,7 @@ Point2 OS_OSX::get_screen_position(int p_screen) const {
return screens[p_screen].pos; 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()); ERR_FAIL_INDEX_V(p_screen, screens.size(), Point2());
return screens[p_screen].size; return screens[p_screen].size;