Skip to content

Commit aa9c130

Browse files
committed
Prevents externally set affine transforms from being reset by the page view controller.
1 parent dfe5269 commit aa9c130

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

SCPageViewController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'SCPageViewController'
3-
s.version = '2.0.6'
3+
s.version = '2.0.7'
44
s.platform = :ios
55
s.ios.deployment_target = '5.0'
66

SCPageViewController/SCPageViewController.m

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,7 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks
586586
}
587587

588588
remainder = [self _subtractRect:intersection fromRect:remainder withEdge:edge];
589-
590-
[self _setAnimatableSublayerTransform:CATransform3DIdentity forViewController:viewController];
591-
589+
592590
// Finally, trigger appearance callbacks and new frame
593591
if(visible && ![self.visibleControllers containsObject:viewController]) {
594592
[self.visibleControllers addObject:viewController];
@@ -614,15 +612,14 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks
614612
[viewController.view setFrame:nextFrame];
615613
}
616614

617-
CATransform3D transform = CATransform3DIdentity;
618-
if([self.layouter respondsToSelector:@selector(sublayerTransformForPageAtIndex:contentOffset:pageViewController:)]) {
619-
transform = [self.layouter sublayerTransformForPageAtIndex:pageIndex
620-
contentOffset:self.scrollView.contentOffset
621-
pageViewController:self];
622-
}
623-
624-
[self _setAnimatableSublayerTransform:transform forViewController:viewController];
625-
}];
615+
if([self.layouter respondsToSelector:@selector(sublayerTransformForPageAtIndex:contentOffset:pageViewController:)]) {
616+
CATransform3D transform = [self.layouter sublayerTransformForPageAtIndex:pageIndex
617+
contentOffset:self.scrollView.contentOffset
618+
pageViewController:self];
619+
620+
[self _setAnimatableSublayerTransform:transform forViewController:viewController];
621+
}
622+
}];
626623
}
627624

628625
- (BOOL)shouldAutomaticallyForwardAppearanceMethods
@@ -1028,7 +1025,6 @@ - (void)_removePageAtIndex:(NSUInteger)pageIndex
10281025

10291026
[viewController willMoveToParentViewController:nil];
10301027
[viewController.view removeFromSuperview];
1031-
[self _setAnimatableSublayerTransform:CATransform3DIdentity forViewController:viewController];
10321028
[viewController removeFromParentViewController];
10331029

10341030
if([self.visibleControllers containsObject:viewController]) {

0 commit comments

Comments
 (0)