TouchInstinct
/
iOS-Slide-Menu
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed glitch where quick swipe in opposite directions may cause the menu not to appear

This commit is contained in:
Aryan Ghassemi 2014-01-22 15:55:54 -08:00
parent d7ad0e1a34
commit 7fa9e10b3e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SlideMenu/Source/SlideNavigationController.m
View File

@ -576,12 +576,14 @@ static SlideNavigationController *singletonInstance;
CGPoint velocity = [aPanRecognizer velocityInView:aPanRecognizer.view];
NSInteger movement = translation.x - self.draggingPoint.x;
Menu menu = (self.horizontalLocation > 0 || (self.horizontalLocation == 0 && translation.x > 0) ) ? MenuLeft : MenuRight;
static Menu lastMenu;
Menu menu = (self.horizontalLocation > 0 || (self.horizontalLocation == 0 && movement > 0) ) ? MenuLeft : MenuRight;
if (aPanRecognizer.state == UIGestureRecognizerStateBegan)
{
[self prepareMenuForReveal:menu forcePrepare:YES];
self.draggingPoint = translation;
lastMenu = menu;
}
else if (aPanRecognizer.state == UIGestureRecognizerStateChanged)
{
@ -589,18 +591,18 @@ static SlideNavigationController *singletonInstance;
CGFloat newHorizontalLocation = [self horizontalLocation];
// Force prepare menu when slides quickly between left and right menu
if ((lastHorizontalLocation < 0 && newHorizontalLocation > 0) ||
(lastHorizontalLocation > 0 && newHorizontalLocation < 0))
if (lastMenu != menu)
[self prepareMenuForReveal:menu forcePrepare:YES];
lastHorizontalLocation = newHorizontalLocation;
newHorizontalLocation += movement;
if (newHorizontalLocation >= self.minXForDragging && newHorizontalLocation <= self.maxXForDragging)
[self moveHorizontallyToLocation:newHorizontalLocation];
self.draggingPoint = translation;
lastMenu = menu;
}
else if (aPanRecognizer.state == UIGestureRecognizerStateEnded)
{
@ -647,6 +649,8 @@ static SlideNavigationController *singletonInstance;
else
[self openMenu:(currentX > 0) ? MenuLeft : MenuRight withCompletion:nil];
}
lastMenu = -1;
}
}