pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an iOS view orientation issue when SDL_GL_CreateContext or SDL_CreateRenderer is called.

Browse source 
--HG--
extra : rebase_source : 8082e18faee33d41e50ef90a53be8a42679f6fb3
This commit is contained in:
Alex Szpakowski 2015-04-10 23:30:31 -03:00
parent 4225abc296
commit 29b1cab6e1
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/video/uikit/SDL_uikitview.m
View file

@ -77,11 +77,8 @@
data.viewcontroller.view = view; data.viewcontroller.view = view;
if (data.uiwindow.rootViewController != data.viewcontroller) { data.uiwindow.rootViewController = nil;
data.uiwindow.rootViewController = data.viewcontroller; data.uiwindow.rootViewController = data.viewcontroller;
} else if (view) {
[data.uiwindow addSubview:view];
}
[data.uiwindow layoutIfNeeded]; [data.uiwindow layoutIfNeeded];
} }
@ -96,13 +93,13 @@
[data.viewcontroller.view removeFromSuperview]; [data.viewcontroller.view removeFromSuperview];
data.viewcontroller.view = self; data.viewcontroller.view = self;
if (data.uiwindow.rootViewController != data.viewcontroller) {
/* The root view controller handles rotation and the status bar. /* The root view controller handles rotation and the status bar.
* Assigning it also adds the controller's view to the window. */ * Assigning it also adds the controller's view to the window. We
* explicitly re-set it to make sure the view is properly attached to
* the window. Just adding the sub-view if the root view controller is
* already correct causes orientation issues on iOS 7 and below. */
data.uiwindow.rootViewController = nil;
data.uiwindow.rootViewController = data.viewcontroller; data.uiwindow.rootViewController = data.viewcontroller;
} else {
[data.uiwindow addSubview:self];
}
/* The view's bounds may not be correct until the next event cycle. That /* The view's bounds may not be correct until the next event cycle. That
* might happen after the current dimensions are queried, so we force a * might happen after the current dimensions are queried, so we force a