fix transition x logic

horitaku46 · Mar 14, 2018 · e8c9f69 · e8c9f69
1 parent 105d94c
commit e8c9f69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/BlowinSwiper/BlowinSwiper.swift b/BlowinSwiper/BlowinSwiper.swift
@@ -50,7 +50,7 @@ public final class BlowinSwiper: NSObject {
         case .began:
             // only right swipe
             let isZeroTransitionY = isLowSensitivity ? translation.y == 0 : true
-            if velocity.x > 0 && isZeroTransitionY {
+            if translation.x > 0 && isZeroTransitionY {
                 isInteractivePop = true
                 navigationController?.popViewController(animated: true)
             }
@@ -61,8 +61,8 @@ public final class BlowinSwiper: NSObject {
 
         case .ended, .cancelled:
             isInteractivePop = false
-            let halfWidth = view.bounds.width / 3
-            velocity.x > Const.maxSwipeVelocityX || translation.x > halfWidth ? percentDriven.finish() : percentDriven.cancel()
+            let maxWidth = view.bounds.width / 3
+            velocity.x > Const.maxSwipeVelocityX || translation.x > maxWidth ? percentDriven.finish() : percentDriven.cancel()
 
         default:
             break

diff --git a/Example/Sources/Controllers/Menu/MenuViewController.swift b/Example/Sources/Controllers/Menu/MenuViewController.swift
@@ -54,7 +54,7 @@ final class MenuViewController: UIViewController, BlowinSwipeable {
         // Enable scrolling by putting finger back during swipe back
         swipeMenuView.contentScrollView?.isScrollEnabled = true
 
-        configureSwipeBack()
+        configureSwipeBack(isLowSensitivity: true)
         enabledRecognizeSimultaneously(scrollView: swipeMenuView.contentScrollView)
     }