From 6df55c6608b9c5b421388e32c412b62a5e55466b Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 23 Nov 2014 23:29:24 -0400 Subject: [PATCH] Removed an ugly hack to make windows rotate properly on iOS 8+. Recent commits apparently resolved the issue that made the hack necessary. --- src/video/uikit/SDL_uikitwindow.h | 6 +----- src/video/uikit/SDL_uikitwindow.m | 19 ++----------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/video/uikit/SDL_uikitwindow.h b/src/video/uikit/SDL_uikitwindow.h index c279d0f6f895b..fd91b56f863c7 100644 --- a/src/video/uikit/SDL_uikitwindow.h +++ b/src/video/uikit/SDL_uikitwindow.h @@ -40,13 +40,9 @@ extern NSUInteger UIKit_GetSupportedOrientations(SDL_Window * window); @class UIWindow; -@interface SDL_uikitwindow : UIWindow - -@end - @interface SDL_WindowData : NSObject -@property (nonatomic, strong) SDL_uikitwindow *uiwindow; +@property (nonatomic, strong) UIWindow *uiwindow; @property (nonatomic, strong) SDL_uikitopenglview *view; @property (nonatomic, strong) SDL_uikitviewcontroller *viewcontroller; diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m index 0c2f12017a828..d1e32b2cb620c 100644 --- a/src/video/uikit/SDL_uikitwindow.m +++ b/src/video/uikit/SDL_uikitwindow.m @@ -41,21 +41,6 @@ #include -@implementation SDL_uikitwindow - -- (void)layoutSubviews -{ - [super layoutSubviews]; - - /* This seems to be needed on iOS 8, otherwise the window's frame is put in - * an unexpected position when the screen or device is rotated. - * FIXME: is there a better solution to that problem than this ugly hack? - */ - self.frame = self.screen.bounds; -} - -@end - @implementation SDL_WindowData @synthesize uiwindow; @@ -65,7 +50,7 @@ @implementation SDL_WindowData @end -static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow, SDL_bool created) +static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created) { SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata; @@ -213,7 +198,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow, /* ignore the size user requested, and make a fullscreen window */ /* !!! FIXME: can we have a smaller view? */ - SDL_uikitwindow *uiwindow = [[SDL_uikitwindow alloc] initWithFrame:data.uiscreen.bounds]; + UIWindow *uiwindow = [[UIWindow alloc] initWithFrame:data.uiscreen.bounds]; /* put the window on an external display if appropriate. This implicitly * does [uiwindow setframe:[uiscreen bounds]], so don't do it on the