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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jack 2015-05-27 17:21:43 +08:00
parent 4d61cc82f6 e9fbbb9b25
commit a8024dbe88
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,26 +286,30 @@
[childViewControllers enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
UIViewController * childController = (UIViewController *)obj;
CGFloat pageOffsetForChild = [self pageOffsetForChildIndex:idx];
if (fabs(self.containerView.contentOffset.x - pageOffsetForChild) < CGRectGetWidth(self.containerView.bounds)){
if (![childController parentViewController]){
if (fabs(self.containerView.contentOffset.x - pageOffsetForChild) < CGRectGetWidth(self.containerView.bounds)) {
if (![childController parentViewController]) { // Add child
[childController beginAppearanceTransition:YES animated:NO];
[self addChildViewController:childController];
[childController didMoveToParentViewController:self];
CGFloat childPosition = [self offsetForChildIndex:idx];
[childController.view setFrame:CGRectMake(childPosition, 0, CGRectGetWidth(self.view.bounds), CGRectGetHeight(self.containerView.bounds))];
childController.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
[self.containerView addSubview:childController.view];
}
else{
[childController didMoveToParentViewController:self];
[childController endAppearanceTransition];
} else {
CGFloat childPosition = [self offsetForChildIndex:idx];
[childController.view setFrame:CGRectMake(childPosition, 0, CGRectGetWidth(self.view.bounds), CGRectGetHeight(self.containerView.bounds))];
childController.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
}
}
else{
if ([childController parentViewController]){
[childController.view removeFromSuperview];
} else {
if ([childController parentViewController]) { // Remove child
[childController willMoveToParentViewController:nil];
[childController beginAppearanceTransition:NO animated:NO];
[childController.view removeFromSuperview];
[childController removeFromParentViewController];
[childController endAppearanceTransition];
}
}
}];