Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #286 from phedlund/master

Property to set if panning cancels touches in a view.
  • Loading branch information...
commit 03adb189afaf9e308e3b8a1111c43af117ee9bff 2 parents 02034e3 + 30ade19
@Inferis authored
View
1  ViewDeck/IIViewDeckController.h
@@ -136,6 +136,7 @@ typedef void (^IIViewDeckControllerBounceBlock) (IIViewDeckController *controlle
@property (nonatomic, assign) CGFloat maxSize;
@property (nonatomic, assign) BOOL resizesCenterView;
@property (nonatomic, assign) IIViewDeckPanningMode panningMode;
+@property (nonatomic, assign) BOOL panningCancelsTouchesInView;
@property (nonatomic, assign) IIViewDeckCenterHiddenInteractivity centerhiddenInteractivity;
@property (nonatomic, assign) IIViewDeckNavigationControllerBehavior navigationControllerBehavior;
@property (nonatomic, assign) BOOL automaticallyUpdateTabBarItems;
View
4 ViewDeck/IIViewDeckController.m
@@ -229,6 +229,7 @@ - (void)didMoveToParentViewController:(UIViewController *)parent;
@implementation IIViewDeckController
@synthesize panningMode = _panningMode;
+@synthesize panningCancelsTouchesInView = _panningCancelsTouchesInView;
@synthesize panners = _panners;
@synthesize referenceView = _referenceView;
@synthesize slidingController = _slidingController;
@@ -277,6 +278,7 @@ - (id)initWithCenterViewController:(UIViewController*)centerController {
_elastic = YES;
_willAppearShouldArrangeViewsAfterRotation = (UIInterfaceOrientation)UIDeviceOrientationUnknown;
_panningMode = IIViewDeckFullViewPanning;
+ _panningCancelsTouchesInView = NO;
_navigationControllerBehavior = IIViewDeckNavigationControllerContained;
_centerhiddenInteractivity = IIViewDeckCenterHiddenUserInteractive;
_sizeMode = IIViewDeckLedgeSizeMode;
@@ -2391,7 +2393,7 @@ - (void)addPanner:(UIView*)view {
if (!view) return;
UIPanGestureRecognizer* panner = II_AUTORELEASE([[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panned:)]);
- panner.cancelsTouchesInView = NO;
+ panner.cancelsTouchesInView = _panningCancelsTouchesInView;
panner.delegate = self;
[view addGestureRecognizer:panner];
[self.panners addObject:panner];
Please sign in to comment.
Something went wrong with that request. Please try again.