asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Really fixes fullscreen mode in OS X, even during startup

Browse source
This commit is contained in:
Ricardo Pérez 2015-05-05 12:02:47 +02:00
parent af06843982
commit 1d619fad86
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/osx/os_osx.mm
View file

@ -966,8 +966,10 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
[window_object makeKeyAndOrderFront:nil]; [window_object makeKeyAndOrderFront:nil];
if (p_desired.fullscreen)
set_window_fullscreen(true);
/*** END OSX INITIALIZATION ***/ /*** END OSX INITIALIZATION ***/
/*** 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) { 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]; [window_object performZoom:nil];
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
zoomed = p_enabled; zoomed = p_enabled;
}; };
bool OS_OSX::is_window_fullscreen() const { bool OS_OSX::is_window_fullscreen() const {
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
if ( [window_object respondsToSelector:@selector(isZoomed)] ) if ( [window_object respondsToSelector:@selector(isZoomed)] )
return [window_object isZoomed]; return [window_object isZoomed];
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
return zoomed; return zoomed;
}; };