@@ -49,8 +49,8 @@ @interface ECSlidingViewController()
49
49
- (void )setup ;
50
50
51
51
- (CGRect)topViewCalculatedFrameForPosition : (ECSlidingViewControllerTopViewPosition)position ;
52
- - (CGRect)underLeftViewCalculatedFrameTopViewPosition : (ECSlidingViewControllerTopViewPosition)position ;
53
- - (CGRect)underRightViewCalculatedFrameTopViewPosition : (ECSlidingViewControllerTopViewPosition)position ;
52
+ - (CGRect)underLeftViewCalculatedFrameForTopViewPosition : (ECSlidingViewControllerTopViewPosition)position ;
53
+ - (CGRect)underRightViewCalculatedFrameForTopViewPosition : (ECSlidingViewControllerTopViewPosition)position ;
54
54
- (CGRect)frameFromDelegateForViewController : (UIViewController *)viewController
55
55
topViewPosition : (ECSlidingViewControllerTopViewPosition)topViewPosition ;
56
56
- (ECSlidingViewControllerOperation)operationFromPosition : (ECSlidingViewControllerTopViewPosition)fromPosition
@@ -178,8 +178,8 @@ - (void)viewDidLayoutSubviews {
178
178
if (self.currentOperation == ECSlidingViewControllerOperationNone) {
179
179
self.gestureView .frame = [self topViewCalculatedFrameForPosition: self .currentTopViewPosition];
180
180
self.topViewController .view .frame = [self topViewCalculatedFrameForPosition: self .currentTopViewPosition];
181
- self.underLeftViewController .view .frame = [self underLeftViewCalculatedFrameTopViewPosition :self .currentTopViewPosition];
182
- self.underRightViewController .view .frame = [self underRightViewCalculatedFrameTopViewPosition :self .currentTopViewPosition];
181
+ self.underLeftViewController .view .frame = [self underLeftViewCalculatedFrameForTopViewPosition :self .currentTopViewPosition];
182
+ self.underRightViewController .view .frame = [self underRightViewCalculatedFrameForTopViewPosition :self .currentTopViewPosition];
183
183
}
184
184
}
185
185
@@ -470,7 +470,7 @@ - (CGRect)topViewCalculatedFrameForPosition:(ECSlidingViewControllerTopViewPosit
470
470
}
471
471
}
472
472
473
- - (CGRect)underLeftViewCalculatedFrameTopViewPosition : (ECSlidingViewControllerTopViewPosition)position {
473
+ - (CGRect)underLeftViewCalculatedFrameForTopViewPosition : (ECSlidingViewControllerTopViewPosition)position {
474
474
CGRect frameFromDelegate = [self frameFromDelegateForViewController: self .underLeftViewController
475
475
topViewPosition: position];
476
476
if (!CGRectIsInfinite (frameFromDelegate)) return frameFromDelegate;
@@ -495,7 +495,7 @@ - (CGRect)underLeftViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTo
495
495
return containerViewFrame;
496
496
}
497
497
498
- - (CGRect)underRightViewCalculatedFrameTopViewPosition : (ECSlidingViewControllerTopViewPosition)position {
498
+ - (CGRect)underRightViewCalculatedFrameForTopViewPosition : (ECSlidingViewControllerTopViewPosition)position {
499
499
CGRect frameFromDelegate = [self frameFromDelegateForViewController: self .underRightViewController
500
500
topViewPosition: position];
501
501
if (!CGRectIsInfinite (frameFromDelegate)) return frameFromDelegate;
@@ -880,10 +880,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
880
880
if ([vc isEqual: self .topViewController]) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionCentered];
881
881
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
882
882
if ([vc isEqual: self .topViewController]) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionAnchoredLeft];
883
- if ([vc isEqual: self .underRightViewController]) return [self underRightViewCalculatedFrameTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredLeft];
883
+ if ([vc isEqual: self .underRightViewController]) return [self underRightViewCalculatedFrameForTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredLeft];
884
884
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {
885
885
if ([vc isEqual: self .topViewController]) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionAnchoredRight];
886
- if ([vc isEqual: self .underLeftViewController]) return [self underLeftViewCalculatedFrameTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredRight];
886
+ if ([vc isEqual: self .underLeftViewController]) return [self underLeftViewCalculatedFrameForTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredRight];
887
887
}
888
888
889
889
return CGRectZero;
@@ -892,10 +892,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
892
892
- (CGRect)finalFrameForViewController : (UIViewController *)vc {
893
893
if (self.currentOperation == ECSlidingViewControllerOperationAnchorLeft) {
894
894
if (vc == self.topViewController ) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionAnchoredLeft];
895
- if (vc == self.underRightViewController ) return [self underRightViewCalculatedFrameTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredLeft];
895
+ if (vc == self.underRightViewController ) return [self underRightViewCalculatedFrameForTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredLeft];
896
896
} else if (self.currentOperation == ECSlidingViewControllerOperationAnchorRight) {
897
897
if (vc == self.topViewController ) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionAnchoredRight];
898
- if (vc == self.underLeftViewController ) return [self underLeftViewCalculatedFrameTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredRight];
898
+ if (vc == self.underLeftViewController ) return [self underLeftViewCalculatedFrameForTopViewPosition : ECSlidingViewControllerTopViewPositionAnchoredRight];
899
899
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
900
900
if (vc == self.topViewController ) return [self topViewCalculatedFrameForPosition: ECSlidingViewControllerTopViewPositionCentered];
901
901
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {
0 commit comments