diff --git a/MNPageViewController/MNPageViewController.h b/MNPageViewController/MNPageViewController.h index a9c6003..9d9a8be 100644 --- a/MNPageViewController/MNPageViewController.h +++ b/MNPageViewController/MNPageViewController.h @@ -44,4 +44,4 @@ - (void)mn_pageViewController:(MNPageViewController *)pageViewController willPageToViewController:(UIViewController *)viewController withRatio:(CGFloat)ratio; -@end \ No newline at end of file +@end diff --git a/MNPageViewController/MNPageViewController.m b/MNPageViewController/MNPageViewController.m index de6d8c7..d6f5444 100644 --- a/MNPageViewController/MNPageViewController.m +++ b/MNPageViewController/MNPageViewController.m @@ -24,7 +24,7 @@ @interface MNPageViewController() - (void)initializeChildControllers; - (void)layoutControllers; -- (void)didPage; +- (void)didPageTo: (UIViewController *)viewController; - (void)setNeedsRatioReset; - (void)setNeedsRatioUpdate; @@ -47,7 +47,7 @@ - (void)viewDidLoad { self.initialized = NO; if (self.viewController) { - CGRect bounds = self.view.bounds; + bounds = self.view.bounds; bounds.origin.x = bounds.size.width; [self.viewController willMoveToParentViewController:self]; @@ -170,18 +170,9 @@ - (void)layoutControllers { self.scrollView.contentInset = UIEdgeInsetsMake(0.f, self.leftInset, 0.f, self.rightInset); } -- (void)didPage { - UIViewController *visibleController = nil; - for (UIViewController *controller in self.childViewControllers) { - CGPoint point = [self.scrollView convertPoint:controller.view.frame.origin toView:self.view]; - - if (point.x == 0.f) { - visibleController = controller; - } - } - +- (void)didPageTo: (UIViewController *)viewController { if (self.delegate && [self.delegate respondsToSelector:@selector(mn_pageViewController:didPageToViewController:)]) { - [self.delegate mn_pageViewController:self didPageToViewController:visibleController]; + [self.delegate mn_pageViewController:self didPageToViewController:viewController]; } } @@ -318,7 +309,7 @@ - (void)queuingScrollViewDidPageForward:(UIScrollView *)scrollView { self.scrollView.contentInset = UIEdgeInsetsMake(0.f, self.leftInset, 0.f, self.rightInset); } - [self didPage]; + [self didPageTo:nextViewController]; } - (void)queuingScrollViewDidPageBackward:(UIScrollView *)scrollView { @@ -367,7 +358,7 @@ - (void)queuingScrollViewDidPageBackward:(UIScrollView *)scrollView { self.scrollView.contentInset = UIEdgeInsetsMake(0.f, self.leftInset, 0.f, self.rightInset); } - [self didPage]; + [self didPageTo:nextViewController]; } @end