diff --git a/src/video/uikit/SDL_uikitopenglview.m b/src/video/uikit/SDL_uikitopenglview.m index 1f33f529d..f388fa31a 100644 --- a/src/video/uikit/SDL_uikitopenglview.m +++ b/src/video/uikit/SDL_uikitopenglview.m @@ -75,14 +75,11 @@ return nil; } -#ifdef __IPHONE_7_0 - /* sRGB context support was added in iOS 7 */ BOOL hasiOS7 = [[UIDevice currentDevice].systemVersion compare:@"7.0" options:NSNumericSearch] != NSOrderedAscending; if (sRGB && hasiOS7) { + /* sRGB EAGL drawable support was added in iOS 7 */ colorFormat = kEAGLColorFormatSRGBA8; - } else -#endif - if (rBits >= 8 && gBits >= 8 && bBits >= 8) { + } else if (rBits >= 8 && gBits >= 8 && bBits >= 8) { /* if user specifically requests rbg888 or some color format higher than 16bpp */ colorFormat = kEAGLColorFormatRGBA8; } else { diff --git a/src/video/uikit/SDL_uikitviewcontroller.m b/src/video/uikit/SDL_uikitviewcontroller.m index d21723bfe..c7b3d0934 100644 --- a/src/video/uikit/SDL_uikitviewcontroller.m +++ b/src/video/uikit/SDL_uikitviewcontroller.m @@ -124,13 +124,8 @@ - (UIStatusBarStyle)preferredStatusBarStyle { -#ifdef __IPHONE_7_0 /* We assume most games don't have a bright white background. */ return UIStatusBarStyleLightContent; -#else - /* This method is only used in iOS 7+, so the return value here isn't important. */ - return UIStatusBarStyleBlackTranslucent; -#endif } @end diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m index 275579adb..9d5f0eeff 100644 --- a/src/video/uikit/SDL_uikitwindow.m +++ b/src/video/uikit/SDL_uikitwindow.m @@ -248,11 +248,10 @@ UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display [UIApplication sharedApplication].statusBarHidden = NO; } -#ifdef __IPHONE_7_0 + /* iOS 7+ won't update the status bar until we tell it to. */ if ([viewcontroller respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) { [viewcontroller setNeedsStatusBarAppearanceUpdate]; } -#endif if (fullscreen || (window->flags & SDL_WINDOW_BORDERLESS)) { bounds = [displaydata->uiscreen bounds];