geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed an ugly hack to make windows rotate properly on iOS 8+. 

Recent commits apparently resolved the issue that made the hack necessary.
main
Alex Szpakowski 2014-11-23 23:29:24 -04:00
parent 9b8a1768f2
commit 6df55c6608
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/uikit/SDL_uikitwindow.h
View File

@ -40,13 +40,9 @@ extern NSUInteger UIKit_GetSupportedOrientations(SDL_Window * window);
@class UIWindow; @class UIWindow;
@interface SDL_uikitwindow : UIWindow
@end
@interface SDL_WindowData : NSObject @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_uikitopenglview *view;
@property (nonatomic, strong) SDL_uikitviewcontroller *viewcontroller; @property (nonatomic, strong) SDL_uikitviewcontroller *viewcontroller;

19
src/video/uikit/SDL_uikitwindow.m
View File

@ -41,21 +41,6 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
@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 @implementation SDL_WindowData
@synthesize uiwindow; @synthesize uiwindow;
@ -65,7 +50,7 @@
@end @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_VideoDisplay *display = SDL_GetDisplayForWindow(window);
SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata; SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata;
@ -213,7 +198,7 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
/* ignore the size user requested, and make a fullscreen window */ /* ignore the size user requested, and make a fullscreen window */
/* !!! FIXME: can we have a smaller view? */ /* !!! 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 /* put the window on an external display if appropriate. This implicitly
* does [uiwindow setframe:[uiscreen bounds]], so don't do it on the * does [uiwindow setframe:[uiscreen bounds]], so don't do it on the