Skip to content

Commit 9326d18

Browse files
committed
1 parent 7e9603e commit 9326d18

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

ECSlidingViewController/ECSlidingViewController.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ @interface ECSlidingViewController()
4949
- (void)setup;
5050

5151
- (CGRect)topViewCalculatedFrameForPosition:(ECSlidingViewControllerTopViewPosition)position;
52-
- (CGRect)underLeftViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
53-
- (CGRect)underRightViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
52+
- (CGRect)underLeftViewCalculatedFrameForTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
53+
- (CGRect)underRightViewCalculatedFrameForTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
5454
- (CGRect)frameFromDelegateForViewController:(UIViewController *)viewController
5555
topViewPosition:(ECSlidingViewControllerTopViewPosition)topViewPosition;
5656
- (ECSlidingViewControllerOperation)operationFromPosition:(ECSlidingViewControllerTopViewPosition)fromPosition
@@ -178,8 +178,8 @@ - (void)viewDidLayoutSubviews {
178178
if (self.currentOperation == ECSlidingViewControllerOperationNone) {
179179
self.gestureView.frame = [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
180180
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];
183183
}
184184
}
185185

@@ -470,7 +470,7 @@ - (CGRect)topViewCalculatedFrameForPosition:(ECSlidingViewControllerTopViewPosit
470470
}
471471
}
472472

473-
- (CGRect)underLeftViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
473+
- (CGRect)underLeftViewCalculatedFrameForTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
474474
CGRect frameFromDelegate = [self frameFromDelegateForViewController:self.underLeftViewController
475475
topViewPosition:position];
476476
if (!CGRectIsInfinite(frameFromDelegate)) return frameFromDelegate;
@@ -495,7 +495,7 @@ - (CGRect)underLeftViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTo
495495
return containerViewFrame;
496496
}
497497

498-
- (CGRect)underRightViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
498+
- (CGRect)underRightViewCalculatedFrameForTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
499499
CGRect frameFromDelegate = [self frameFromDelegateForViewController:self.underRightViewController
500500
topViewPosition:position];
501501
if (!CGRectIsInfinite(frameFromDelegate)) return frameFromDelegate;
@@ -880,10 +880,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
880880
if ([vc isEqual:self.topViewController]) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
881881
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
882882
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];
884884
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {
885885
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];
887887
}
888888

889889
return CGRectZero;
@@ -892,10 +892,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
892892
- (CGRect)finalFrameForViewController:(UIViewController *)vc {
893893
if (self.currentOperation == ECSlidingViewControllerOperationAnchorLeft) {
894894
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];
896896
} else if (self.currentOperation == ECSlidingViewControllerOperationAnchorRight) {
897897
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];
899899
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
900900
if (vc == self.topViewController) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
901901
} else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {

0 commit comments

Comments
 (0)