TouchInstinct
/
FSCalendar
309
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Wenchao Ding 2016-08-07 14:40:59 +08:00
parent a7c3d95c66 85e600aeea
commit eed03b59c8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FSCalendar/FSCalendarAnimator.m
View File

@ -87,8 +87,8 @@
return YES;
}
if (gestureRecognizer == self.calendar.scopeGesture) {
CGPoint velocity = [self.collectionView.panGestureRecognizer velocityInView:self.collectionView];
BOOL shouldStart = (ABS(velocity.x)<ABS(velocity.y));
CGPoint velocity = [(UIPanGestureRecognizer *)gestureRecognizer velocityInView:self.calendar.daysContainer];
BOOL shouldStart = (ABS(velocity.x)<=ABS(velocity.y));
if (shouldStart) {
self.calendar.collectionView.panGestureRecognizer.enabled = NO;
self.calendar.collectionView.panGestureRecognizer.enabled = YES;
@ -98,6 +98,11 @@
return NO;
}
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
{
return otherGestureRecognizer == self.collectionView.panGestureRecognizer && self.collectionView.decelerating;
}
- (void)scopeTransitionDidBegin:(UIPanGestureRecognizer *)panGesture
{
self.state = FSCalendarTransitionStateInProgress;