Skip to content

Commit 2f572cb

Browse files
authored
Merge pull request #2 from fuboyou/master
panGesture exception disable,fix griddynamics#445
2 parents 5bd6d1d + a7d1a22 commit 2f572cb

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

MMDrawerController/MMDrawerController.m

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,13 +1065,7 @@ -(void)tapGestureCallback:(UITapGestureRecognizer *)tapGesture{
10651065
-(void)panGestureCallback:(UIPanGestureRecognizer *)panGesture{
10661066
switch (panGesture.state) {
10671067
case UIGestureRecognizerStateBegan:{
1068-
if(self.animatingDrawer){
1069-
[panGesture setEnabled:NO];
1070-
break;
1071-
}
1072-
else {
1073-
self.startingPanRect = self.centerContainerView.frame;
1074-
}
1068+
self.startingPanRect = self.centerContainerView.frame;
10751069
}
10761070
case UIGestureRecognizerStateChanged:{
10771071
self.view.userInteractionEnabled = NO;
@@ -1371,6 +1365,14 @@ -(UIViewController*)childViewControllerForSide:(MMDrawerSide)drawerSide{
13711365
}
13721366

13731367
#pragma mark - UIGestureRecognizerDelegate
1368+
- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer {
1369+
if (self.isAnimatingDrawer) {
1370+
return NO;
1371+
} else {
1372+
return YES;
1373+
}
1374+
}
1375+
13741376
-(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{
13751377

13761378
if(self.openSide == MMDrawerSideNone){

0 commit comments

Comments
 (0)