We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to fix crash when Info.plist orientations don't match the SDL window's orientation.

SDL_ios_window_orientations.diff (text/plain), 2.65 KB, created by Alex Szpakowski on 2015-05-01 20:11:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Szpakowski

Created: 2015-05-01 20:11:30 UTC

Size: 2.65 KB

patch

obsolete

>diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m
>--- a/src/video/uikit/SDL_uikitwindow.m
>+++ b/src/video/uikit/SDL_uikitwindow.m
>@@ -191,13 +191,10 @@
>         }
> 
>         if (data.uiscreen == [UIScreen mainScreen]) {
>-            NSUInteger orientations = UIKit_GetSupportedOrientations(window);
>-            UIApplication *app = [UIApplication sharedApplication];
>-
>             if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
>-                app.statusBarHidden = YES;
>+                [UIApplication sharedApplication].statusBarHidden = YES;
>             } else {
>-                app.statusBarHidden = NO;
>+                [UIApplication sharedApplication].statusBarHidden = NO;
>             }
>         }
> 
>@@ -345,9 +342,21 @@
> UIKit_GetSupportedOrientations(SDL_Window * window)
> {
>     const char *hint = SDL_GetHint(SDL_HINT_ORIENTATIONS);
>+    NSUInteger validOrientations = UIInterfaceOrientationMaskAll;
>     NSUInteger orientationMask = 0;
> 
>     @autoreleasepool {
>+        SDL_WindowData *data = (__bridge SDL_WindowData *) window->driverdata;
>+        UIApplication *app = [UIApplication sharedApplication];
>+
>+        /* Get all possible valid orientations. If the app delegate doesn't tell
>+         * us, we get the orientations from Info.plist via UIApplication. */
>+        if ([app.delegate respondsToSelector:@selector(application:supportedInterfaceOrientationsForWindow:)]) {
>+            validOrientations = [app.delegate application:app supportedInterfaceOrientationsForWindow:data.uiwindow];
>+        } else if ([app respondsToSelector:@selector(supportedInterfaceOrientationsForWindow:)]) {
>+            validOrientations = [app supportedInterfaceOrientationsForWindow:data.uiwindow];
>+        }
>+
>         if (hint != NULL) {
>             NSArray *orientations = [@(hint) componentsSeparatedByString:@" "];
> 
>@@ -379,10 +388,17 @@
>             }
>         }
> 
>-        /* Don't allow upside-down orientation on the phone, so answering calls is in the natural orientation */
>+        /* Don't allow upside-down orientation on phones, so answering calls is in the natural orientation */
>         if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone) {
>             orientationMask &= ~UIInterfaceOrientationMaskPortraitUpsideDown;
>         }
>+
>+        /* If none of the specified orientations are actually supported by the
>+         * app, we'll revert to what the app supports. An exception would be
>+         * thrown by the system otherwise. */
>+        if ((validOrientations & orientationMask) == 0) {
>+            orientationMask = validOrientations;
>+        }
>     }
> 
>     return orientationMask;

Actions: View | Diff

Attachments on bug 2967: 2146

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.