Merge pull request weissi#30 from sptramer/feature-configurations

[FEATURE] Configurable snapping distance

Author: weissi

FRLayeredNavigationController/FRLayeredNavigationController.m

@@ -288,9 +288,9 @@ + (BOOL)viewController:(FRLayerController *)vc xTranslation:(CGFloat)origXTransl
     const FRLayeredNavigationItem *navItem = vc.layeredNavigationItem;
     const CGPoint initPos = navItem.initialViewPosition;
 
+    CGRect f = vc.view.frame;
     if (bounded) {
         /* apply translation to fancy item position first and then apply to view */
-        CGRect f = vc.view.frame;
         f.origin = navItem.currentViewPosition;
         f.origin.x += origXTranslation;
 
@@ -301,7 +301,6 @@ + (BOOL)viewController:(FRLayerController *)vc xTranslation:(CGFloat)origXTransl
         vc.view.frame = f;
         navItem.currentViewPosition = f.origin;
     } else {
-        CGRect f = vc.view.frame;
         CGFloat xTranslation;
         if (f.origin.x < initPos.x && origXTranslation < 0) {
             /* if view already left from left bound and still moving left, half moving speed */
@@ -348,7 +347,9 @@ - (void)viewControllersToSnappingPointsMethod:(SnappingPointsMethod)method
 
         const CGFloat curDiff = myPos.x - last.layeredNavigationItem.currentViewPosition.x;
         const CGFloat initDiff = myInitPos.x - last.layeredNavigationItem.initialViewPosition.x;
-        const CGFloat maxDiff = CGRectGetWidth(last.view.frame);
+        const CGFloat maxDiff = ((last.layeredNavigationItem.snappingDistance >= 0) ?
+                                 last.layeredNavigationItem.snappingDistance :
+                                 CGRectGetWidth(last.view.frame));
 
         if (xTranslation == 0 && (CGFloatNotEqual(curDiff, initDiff) && CGFloatNotEqual(curDiff, maxDiff))) {
             switch (method) {
@@ -411,7 +412,9 @@ - (void)moveViewControllersXTranslation:(CGFloat)xTranslationGesture
 
         const CGPoint myPos = meNavItem.currentViewPosition;
         const CGPoint myInitPos = meNavItem.initialViewPosition;
-        const CGFloat myWidth = CGRectGetWidth(me.view.frame);
+        const CGFloat myWidth = ((meNavItem.snappingDistance >= 0) ?
+                                 meNavItem.snappingDistance :
+                                 CGRectGetWidth(me.view.frame));
         CGPoint myNewPos = myPos;
 
         const CGPoint myOldPos = myPos;

FRLayeredNavigationController/FRLayeredNavigationItem.h

@@ -43,6 +43,7 @@
     NSString *_title;
     UIView *_titleView;
     CGFloat _width;
+    CGFloat _snappingDistance;
     CGFloat _nextItemDistance;
     BOOL _hasChrome;
     BOOL _hasBorder;
@@ -75,6 +76,12 @@
  */
 @property (nonatomic, readwrite) CGFloat width;
 
+/**
+ * The maximum distance (when the child layer is being pulled out) to the next layer in points.
+ * If this value is unset, it defaults to the layer's width.
+ */
+@property (nonatomic, readwrite) CGFloat snappingDistance;
+
 /**
  * The minimal distance (when the child layer is as far on the left as possible) to the next layer in points.
  */

FRLayeredNavigationController/FRLayeredNavigationItem.m

@@ -46,6 +46,7 @@ - (id)init
     if ((self = [super init])) {
         self->_width = -1;
         self->_nextItemDistance = -1;
+        self->_snappingDistance = -1;
         self->_hasChrome = YES;
         self->_displayShadow = YES;
         self->_hasBorder = YES;
@@ -80,6 +81,7 @@ - (UIBarButtonItem *)rightBarButtonItem
 @synthesize title = _title;
 @synthesize titleView = _titleView;
 @synthesize width = _width;
+@synthesize snappingDistance = _snappingDistance;
 @synthesize nextItemDistance = _nextItemDistance;
 @synthesize hasChrome = _hasChrome;
 @synthesize hasBorder = _hasBorder;