Reverted Alex's commit 131cba1768a5 - we're about to release 2.0.6, d…

…on't remove support for the iOS 7 SDK yet.
libsdl-org · Sep 21, 2017 · f0a324f · f0a324f
1 parent d452b89
commit f0a324f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/video/uikit/SDL_uikitmessagebox.m b/src/video/uikit/SDL_uikitmessagebox.m
@@ -55,6 +55,7 @@
 static BOOL
 UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 {
+#ifdef __IPHONE_8_0
     int i;
     int __block clickedindex = messageboxdata->numbuttons;
     const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
@@ -110,6 +111,9 @@
 
     *buttonid = messageboxdata->buttons[clickedindex].buttonid;
     return YES;
+#else
+    return NO;
+#endif /* __IPHONE_8_0 */
 }
 
 /* UIAlertView is deprecated in iOS 8+ in favor of UIAlertController. */

diff --git a/src/video/uikit/SDL_uikitmetalview.m b/src/video/uikit/SDL_uikitmetalview.m
@@ -92,9 +92,12 @@ - (void)updateDrawableSize
          * backing dimensions of the Metal view will match the pixel
          * dimensions of the screen rather than the dimensions in points.
          */
+#ifdef __IPHONE_8_0
         if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
             scale = data.uiwindow.screen.nativeScale;
-        } else {
+        } else
+#endif
+        {
             scale = data.uiwindow.screen.scale;
         }
     }

diff --git a/src/video/uikit/SDL_uikitmodes.m b/src/video/uikit/SDL_uikitmodes.m
@@ -211,11 +211,13 @@ @implementation SDL_DisplayModeData
         availableModes = data.uiscreen.availableModes;
 #endif
 
+#ifdef __IPHONE_8_0
         /* The UIScreenMode of an iPhone 6 Plus should be 1080x1920 rather than
          * 1242x2208 (414x736@3x), so we should use the native scale. */
         if ([data.uiscreen respondsToSelector:@selector(nativeScale)]) {
             scale = data.uiscreen.nativeScale;
         }
+#endif
 
         for (UIScreenMode *uimode in availableModes) {
             /* The size of a UIScreenMode is in pixels, but we deal exclusively

diff --git a/src/video/uikit/SDL_uikitopengles.m b/src/video/uikit/SDL_uikitopengles.m
@@ -168,9 +168,12 @@ int UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
             /* Set the scale to the natural scale factor of the screen - the
              * backing dimensions of the OpenGL view will match the pixel
              * dimensions of the screen rather than the dimensions in points. */
+#ifdef __IPHONE_8_0
             if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
                 scale = data.uiwindow.screen.nativeScale;
-            } else {
+            } else
+#endif
+            {
                 scale = data.uiwindow.screen.scale;
             }
         }