kylefang/ECSlidingViewController
1
0
Fork 0
mirror of https://github.com/zhigang1992/ECSlidingViewController.git synced 2026-01-12 22:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sovanna_master'

Browse Source
This commit is contained in:
Mike Enriquez
2012-10-30 11:04:42 -04:00
parent 53de47388f 4ecafc5f22
commit a68af01db0
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.m vendored
View File

@@ -257,16 +257,22 @@ NSString *const ECSlidingViewTopDidReset = @"ECSlidingViewTopDidRese
self.initialTouchPositionX = currentTouchPositionX;
self.initialHoizontalCenter = self.topView.center.x;
} else if (recognizer.state == UIGestureRecognizerStateChanged) {
CGFloat panAmount = self.initialTouchPositionX - currentTouchPositionX;
CGFloat newCenterPosition = self.initialHoizontalCenter - panAmount;
if ((newCenterPosition < self.resettedCenter && self.anchorLeftTopViewCenter == NSNotFound) || (newCenterPosition > self.resettedCenter && self.anchorRightTopViewCenter == NSNotFound)) {
newCenterPosition = self.resettedCenter;
CGPoint translation = [recognizer translationInView:self.view];
if(fabs(translation.x) > fabs(translation.y))
{
CGFloat panAmount = self.initialTouchPositionX - currentTouchPositionX;
CGFloat newCenterPosition = self.initialHoizontalCenter - panAmount;
if ((newCenterPosition < self.resettedCenter && self.anchorLeftTopViewCenter == NSNotFound) || (newCenterPosition > self.resettedCenter && self.anchorRightTopViewCenter == NSNotFound)) {
newCenterPosition = self.resettedCenter;
}
[self topViewHorizontalCenterWillChange:newCenterPosition];
[self updateTopViewHorizontalCenter:newCenterPosition];
[self topViewHorizontalCenterDidChange:newCenterPosition];
}
[self topViewHorizontalCenterWillChange:newCenterPosition];
[self updateTopViewHorizontalCenter:newCenterPosition];
[self topViewHorizontalCenterDidChange:newCenterPosition];
} else if (recognizer.state == UIGestureRecognizerStateEnded || recognizer.state == UIGestureRecognizerStateCancelled) {
CGPoint currentVelocityPoint = [recognizer velocityInView:self.view];
CGFloat currentVelocityX = currentVelocityPoint.x;