Skip to content

Commit 245e7e9

Browse files
author
Sean Wolter
committed
Merge pull request #2 from designatednerd/master
Updates per request of twoToasters team
2 parents 411c1c6 + 07490ff commit 245e7e9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

TWTSideMenuViewController/TWTSideMenuViewController.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
307307

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

310-
311310
//Create default animation curve.
312311
UIViewAnimationOptions options = UIViewAnimationOptionCurveEaseInOut;
313312
switch (self.animationType) {
@@ -318,9 +317,8 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
318317
break;
319318
}
320319
case TWTSideMenuAnimationTypeFadeIn:
321-
incomingViewController.view.alpha = .6;
320+
incomingViewController.view.alpha = 0.6f;
322321
options = UIViewAnimationOptionCurveEaseOut;
323-
324322
break;
325323
}
326324

@@ -331,7 +329,7 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
331329
incomingViewController.view.transform = CGAffineTransformIdentity;
332330
break;
333331
case TWTSideMenuAnimationTypeFadeIn:
334-
incomingViewController.view.alpha = 1;
332+
incomingViewController.view.alpha = 1.0f;
335333
default:
336334
break;
337335
}

0 commit comments

Comments
 (0)