Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Unbalanced calls to begin/end appearance transitions using non-animated setCenterViewController:withCloseAnimation:completion: #66

Merged
merged 2 commits into from
Aug 13, 2013
Merged

Unbalanced calls to begin/end appearance transitions using non-animated setCenterViewController:withCloseAnimation:completion: #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5491817
Potential Fix for #66
kcharwood Aug 2, 2013
293bd3e
Fixed for the full close animation when there is no animation
kcharwood Aug 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions MMDrawerController/MMDrawerController.m
View file
Original file line number Diff line number Diff line change
@@ -336,10 +336,7 @@ -(void)setCenterViewController:(UIViewController *)centerViewController animated
}

-(void)setCenterViewController:(UIViewController *)newCenterViewController withCloseAnimation:(BOOL)animated completion:(void(^)(BOOL))completion{
UIViewController * currentCenterViewController = self.centerViewController;
[currentCenterViewController beginAppearanceTransition:NO animated:NO];
[self setCenterViewController:newCenterViewController animated:animated];
[currentCenterViewController endAppearanceTransition];

if(self.openSide != MMDrawerSideNone){
[self updateDrawerVisualStateForDrawerSide:self.openSide percentVisible:1.0];
@@ -365,7 +362,8 @@ -(void)setCenterViewController:(UIViewController *)newCenterViewController withC
}

-(void)setCenterViewController:(UIViewController *)newCenterViewController withFullCloseAnimation:(BOOL)animated completion:(void(^)(BOOL))completion{
if(self.openSide != MMDrawerSideNone){
if(self.openSide != MMDrawerSideNone &&
animated){

UIViewController * sideDrawerViewController = [self sideDrawerViewControllerForSide:self.openSide];

@@ -428,6 +426,9 @@ -(void)setCenterViewController:(UIViewController *)newCenterViewController withF
}
else {
[self setCenterViewController:newCenterViewController animated:animated];
if(self.openSide != MMDrawerSideNone){
[self closeDrawerAnimated:animated completion:completion];
}
}
}