TouchInstinct
/
XLPagerTabStrip
322
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5 from xhzengAIB/master 

Add property control current page update action.
This commit is contained in:
Martin Barreto 2015-07-28 21:39:43 -03:00
parent e9fbbb9b25 146a25e371
commit 8a6972e710
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
View File

@ -93,7 +93,9 @@ typedef NS_ENUM(NSUInteger, XLPagerTabStripDirection) {
@property BOOL isElasticIndicatorLimit;
-(void)moveToViewControllerAtIndex:(NSUInteger)index;
-(void)moveToViewControllerAtIndex:(NSUInteger)index animated:(bool)animated;
-(void)moveToViewController:(UIViewController *)viewController;
-(void)moveToViewController:(UIViewController *)viewController animated:(bool)animated;
-(void)reloadPagerTabStripView;
@end

14
XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
View File

@ -98,13 +98,6 @@
}
}
-(void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
_lastSize = self.containerView.bounds.size;
}
-(void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
@ -166,6 +159,9 @@
[self moveToViewControllerAtIndex:[self.pagerTabStripChildViewControllers indexOfObject:viewController]];
}
-(void)moveToViewController:(UIViewController *)viewController animated:(bool)animated {
[self moveToViewControllerAtIndex:[self.pagerTabStripChildViewControllers indexOfObject:viewController] animated:animated];
}
#pragma mark - XLPagerTabStripViewControllerDelegate
@ -279,7 +275,7 @@
}
NSArray * childViewControllers = self.pagerTabStripChildViewControllers;
self.containerView.contentSize = CGSizeMake(CGRectGetWidth(self.containerView.bounds) * childViewControllers.count, self.containerView.contentSize.height);
[childViewControllers enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
UIViewController * childController = (UIViewController *)obj;
CGFloat pageOffsetForChild = [self pageOffsetForChildIndex:idx];
@ -315,7 +311,7 @@
NSInteger virtualPage = [self virtualPageForContentOffset:self.containerView.contentOffset.x];
NSUInteger newCurrentIndex = [self pageForVirtualPage:virtualPage];
self.currentIndex = newCurrentIndex;
if (self.isProgressiveIndicator){
if ([self.delegate respondsToSelector:@selector(pagerTabStripViewController:updateIndicatorFromIndex:toIndex:withProgressPercentage:)]){
CGFloat scrollPercentage = [self scrollPercentage];