Skip to content

Commit

Permalink
Merge pull request #2 from designatednerd/master
Browse files Browse the repository at this point in the history
Updates per request of twoToasters team
  • Loading branch information
Sean Wolter committed Jan 3, 2014
2 parents 411c1c6 + 07490ff commit 245e7e9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions TWTSideMenuViewController/TWTSideMenuViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B

incomingViewController.view.frame = self.containerView.bounds;


//Create default animation curve.
UIViewAnimationOptions options = UIViewAnimationOptionCurveEaseInOut;
switch (self.animationType) {
Expand All @@ -318,9 +317,8 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
break;
}
case TWTSideMenuAnimationTypeFadeIn:
incomingViewController.view.alpha = .6;
incomingViewController.view.alpha = 0.6f;
options = UIViewAnimationOptionCurveEaseOut;

break;
}

Expand All @@ -331,7 +329,7 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
incomingViewController.view.transform = CGAffineTransformIdentity;
break;
case TWTSideMenuAnimationTypeFadeIn:
incomingViewController.view.alpha = 1;
incomingViewController.view.alpha = 1.0f;
default:
break;
}
Expand Down

0 comments on commit 245e7e9

Please sign in to comment.