@@ -3007,7 +3007,6 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
3007
3007
if (currentSide != IIViewDeckNoSide) _controllers[currentSide] = nil;
3008
3008
[prevController setViewDeckController:nil];
3009
3009
[prevController removeFromParentViewController];
3010
- [prevController didMoveToParentViewController:nil];
3011
3010
}
3012
3011
3013
3012
// make the switch
@@ -3020,12 +3019,10 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
3020
3019
if (controller) {
3021
3020
// and finish the transition
3022
3021
void(^finishTransition)(void) = ^{
3023
- UIViewController* parentController = [[self parentViewController] parentViewController] ?: [self presentingViewController] ?: self;
3024
-
3025
- [parentController addChildViewController:controller];
3022
+ [self addChildViewController:controller];
3026
3023
[controller setViewDeckController:self];
3027
3024
afterBlock(controller);
3028
- [controller didMoveToParentViewController:parentController ];
3025
+ [controller didMoveToParentViewController:self ];
3029
3026
[self applyCenterViewOpacityIfNeeded];
3030
3027
};
3031
3028
@@ -3141,9 +3138,7 @@ - (void)setCenterController:(UIViewController *)centerController {
3141
3138
@catch (NSException *exception) {}
3142
3139
[_centerController setViewDeckController:nil];
3143
3140
[_centerController removeFromParentViewController];
3144
-
3145
3141
3146
- [_centerController didMoveToParentViewController:nil];
3147
3142
II_RELEASE(_centerController);
3148
3143
}
3149
3144
@@ -3152,7 +3147,6 @@ - (void)setCenterController:(UIViewController *)centerController {
3152
3147
3153
3148
if (_centerController) {
3154
3149
II_RETAIN(_centerController);
3155
- [_centerController willMoveToParentViewController:self];
3156
3150
[self addChildViewController:_centerController];
3157
3151
[_centerController setViewDeckController:self];
3158
3152
[_centerController addObserver:self forKeyPath:@"title" options:0 context:nil];
@@ -3278,7 +3272,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
3278
3272
#pragma mark - transition blocks
3279
3273
3280
3274
- (void)enqueueFinishTransitionBlock:(void(^)(void))finishTransition forController:(UIViewController*)controller {
3281
- [controller willMoveToParentViewController:self ];
3275
+ [self addChildViewController:controller ];
3282
3276
if (self.referenceView) {
3283
3277
finishTransition();
3284
3278
}
0 commit comments