Skip to content

Commit ae9c910

Browse files
committed
fix: view controller containment
1 parent 5046df9 commit ae9c910

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

ViewDeck/IIViewDeckController.m

+3-9
Original file line numberDiff line numberDiff line change
@@ -3007,7 +3007,6 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
30073007
if (currentSide != IIViewDeckNoSide) _controllers[currentSide] = nil;
30083008
[prevController setViewDeckController:nil];
30093009
[prevController removeFromParentViewController];
3010-
[prevController didMoveToParentViewController:nil];
30113010
}
30123011

30133012
// make the switch
@@ -3020,12 +3019,10 @@ - (void)setController:(UIViewController *)controller forSide:(IIViewDeckSide)sid
30203019
if (controller) {
30213020
// and finish the transition
30223021
void(^finishTransition)(void) = ^{
3023-
UIViewController* parentController = [[self parentViewController] parentViewController] ?: [self presentingViewController] ?: self;
3024-
3025-
[parentController addChildViewController:controller];
3022+
[self addChildViewController:controller];
30263023
[controller setViewDeckController:self];
30273024
afterBlock(controller);
3028-
[controller didMoveToParentViewController:parentController];
3025+
[controller didMoveToParentViewController:self];
30293026
[self applyCenterViewOpacityIfNeeded];
30303027
};
30313028

@@ -3141,9 +3138,7 @@ - (void)setCenterController:(UIViewController *)centerController {
31413138
@catch (NSException *exception) {}
31423139
[_centerController setViewDeckController:nil];
31433140
[_centerController removeFromParentViewController];
3144-
31453141

3146-
[_centerController didMoveToParentViewController:nil];
31473142
II_RELEASE(_centerController);
31483143
}
31493144

@@ -3152,7 +3147,6 @@ - (void)setCenterController:(UIViewController *)centerController {
31523147

31533148
if (_centerController) {
31543149
II_RETAIN(_centerController);
3155-
[_centerController willMoveToParentViewController:self];
31563150
[self addChildViewController:_centerController];
31573151
[_centerController setViewDeckController:self];
31583152
[_centerController addObserver:self forKeyPath:@"title" options:0 context:nil];
@@ -3278,7 +3272,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
32783272
#pragma mark - transition blocks
32793273

32803274
- (void)enqueueFinishTransitionBlock:(void(^)(void))finishTransition forController:(UIViewController*)controller {
3281-
[controller willMoveToParentViewController:self];
3275+
[self addChildViewController:controller];
32823276
if (self.referenceView) {
32833277
finishTransition();
32843278
}

0 commit comments

Comments
 (0)