|
|
@@ -966,8 +966,10 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
|
|
|
|
|
|
[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 ***/
|
|
|
@@ -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;
|
|
|
};
|
punto-