Merge pull request #379 from IBAnimatable/hotfix/animations

Fix view translate {x,y} for {slide, squeeze} animation
IBAnimatable · Dec 27, 2016 · 0d81c6e · 0d81c6e
2 parents 0807a1d + 3914a1d
commit 0d81c6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,8 @@ None
 None
 
 #### Bugfixes
-None
+
+- Fix `slide(.out, *)` and `squeeze(.out, *)` translation coordinates [#379](https://github.com/IBAnimatable/IBAnimatable/issues/379)
 
 ### [3.1.2](https://github.com/IBAnimatable/IBAnimatable/releases/tag/3.1.2)
 

diff --git a/IBAnimatable/Animatable.swift b/IBAnimatable/Animatable.swift
@@ -406,8 +406,6 @@ public extension Animatable where Self: UIView {
 
 private extension Animatable where Self: UIView {
   func computeValues(way: AnimationType.Way, direction: AnimationType.Direction, shouldScale: Bool) -> AnimationValues {
-    let yDistance = screenSize.height * force
-    let xDistance = screenSize.width * force
     let scale = 3 * force
     var scaleX: CGFloat = 1
     var scaleY: CGFloat = 1
@@ -416,14 +414,17 @@ private extension Animatable where Self: UIView {
     var y: CGFloat = 0
     switch direction {
     case .left:
-      x = -xDistance
+      x = -(screenSize.width - frame.maxX + frame.width)
     case .right:
-      x = xDistance
+      x = frame.maxX
     case .down:
-      y = -yDistance
+      y = -(screenSize.height - frame.maxY + frame.height)
     case .up:
-      y = yDistance
+      y = frame.maxY
     }
+
+    x *= force
+    y *= force
     if shouldScale && direction.isVertical() {
       scaleY = scale
     } else if shouldScale {