When scrolling is disabled, reject the pan gesture recognizer entirel…

…y (so that the carousel doesn't take control when other pan gesture recognizers are involved)
acekiller · Mar 8, 2012 · 4a4b515 · 4a4b515
1 parent 01c0351
commit 4a4b515
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/iCarousel/iCarousel.m b/iCarousel/iCarousel.m
@@ -1841,7 +1841,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gesture shouldReceiveTouch:(UIT
     else if ([gesture isKindOfClass:[UIPanGestureRecognizer class]])
     {
         if ([self viewOrSuperview:touch.view isKindOfClass:[UISlider class]] ||
-            [self viewOrSuperview:touch.view isKindOfClass:[UISwitch class]])
+            [self viewOrSuperview:touch.view isKindOfClass:[UISwitch class]] ||
+			!scrollEnabled)
         {
             return NO;
         }