Skip to content

Added check isAnimatingDrawer in setMaximumDrawerWidth #459

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added check isAnimatingDrawer in setMaximumDrawerWidth #459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
85 changes: 48 additions & 37 deletions MMDrawerController/MMDrawerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,46 +589,57 @@ -(void)setMaximumRightDrawerWidth:(CGFloat)width animated:(BOOL)animated complet
}

- (void)setMaximumDrawerWidth:(CGFloat)width forSide:(MMDrawerSide)drawerSide animated:(BOOL)animated completion:(void(^)(BOOL finished))completion{
NSParameterAssert(width > 0);
NSParameterAssert(drawerSide != MMDrawerSideNone);

UIViewController *sideDrawerViewController = [self sideDrawerViewControllerForSide:drawerSide];
CGFloat oldWidth = 0.f;
NSInteger drawerSideOriginCorrection = 1;
if (drawerSide == MMDrawerSideLeft) {
oldWidth = _maximumLeftDrawerWidth;
_maximumLeftDrawerWidth = width;
}
else if(drawerSide == MMDrawerSideRight){
oldWidth = _maximumRightDrawerWidth;
_maximumRightDrawerWidth = width;
drawerSideOriginCorrection = -1;
if(self.isAnimatingDrawer){
if(completion){
completion(NO);
}
}

CGFloat distance = ABS(width-oldWidth);
NSTimeInterval duration = [self animationDurationForAnimationDistance:distance];

if(self.openSide == drawerSide){
CGRect newCenterRect = self.centerContainerView.frame;
newCenterRect.origin.x = drawerSideOriginCorrection*width;
[UIView
animateWithDuration:(animated?duration:0)
delay:0.0
options:UIViewAnimationOptionCurveEaseInOut
animations:^{
[self.centerContainerView setFrame:newCenterRect];
[sideDrawerViewController.view setFrame:sideDrawerViewController.mm_visibleDrawerFrame];
}
completion:^(BOOL finished) {
if(completion != nil){
completion(finished);
else {

NSParameterAssert(width > 0);
NSParameterAssert(drawerSide != MMDrawerSideNone);

UIViewController *sideDrawerViewController = [self sideDrawerViewControllerForSide:drawerSide];
CGFloat oldWidth = 0.f;
NSInteger drawerSideOriginCorrection = 1;
if (drawerSide == MMDrawerSideLeft) {
oldWidth = _maximumLeftDrawerWidth;
_maximumLeftDrawerWidth = width;
}
else if(drawerSide == MMDrawerSideRight){
oldWidth = _maximumRightDrawerWidth;
_maximumRightDrawerWidth = width;
drawerSideOriginCorrection = -1;
}

CGFloat distance = ABS(width-oldWidth);
NSTimeInterval duration = [self animationDurationForAnimationDistance:distance];

if(self.openSide == drawerSide){
CGRect newCenterRect = self.centerContainerView.frame;
newCenterRect.origin.x = drawerSideOriginCorrection*width;
[UIView
animateWithDuration:(animated?duration:0)
delay:0.0
options:UIViewAnimationOptionCurveEaseInOut
animations:^{
[self.centerContainerView setFrame:newCenterRect];
[sideDrawerViewController.view setFrame:sideDrawerViewController.mm_visibleDrawerFrame];
}
}];
}
else{
[sideDrawerViewController.view setFrame:sideDrawerViewController.mm_visibleDrawerFrame];
if(completion != nil){
completion(YES);
completion:^(BOOL finished) {
[self setAnimatingDrawer:NO];
if(completion != nil){
completion(finished);
}
}];
}
else{
[sideDrawerViewController.view setFrame:sideDrawerViewController.mm_visibleDrawerFrame];
[self setAnimatingDrawer:NO];
if(completion != nil){
completion(YES);
}
}
}
}
Expand Down