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

Merge pull request #1818 from ricpelo/ricpelo-patch-5 

Really fixes fullscreen mode in OS X, even during startup
This commit is contained in:
punto- 2015-05-06 04:36:57 -03:00
parent e2419f74d9 1d619fad86
commit fbd9839131
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/osx/os_osx.mm
View File

@ -968,6 +968,8 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
[window_object makeKeyAndOrderFront:nil];
if (p_desired.fullscreen)
set_window_fullscreen(true);
/*** END OSX INITIALIZATION ***/
/*** END OSX INITIALIZATION ***/
@ -1310,14 +1312,20 @@ void OS_OSX::set_window_size(const Size2 p_size) {
void OS_OSX::set_window_fullscreen(bool p_enabled) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
[window_object toggleFullScreen:nil];
#else
[window_object performZoom:nil];
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
zoomed = p_enabled;
};
bool OS_OSX::is_window_fullscreen() const {
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
if ( [window_object respondsToSelector:@selector(isZoomed)] )
return [window_object isZoomed];
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
return zoomed;
};