Merge pull request #73 from hyperoslo/fix/content-animation

Fix slide views animation
hyperoslo · Oct 6, 2015 · 29e43b0 · 29e43b0
2 parents 96dddea + 75bf513
commit 29e43b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/Example/Parallax/Podfile.lock b/Example/Parallax/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
   - Hex (2.0)
   - Pages (0.6.2)
   - Presentation (2.0.0):
-    - Cartography (~> 0.6.0)
+    - Cartography
     - Pages (~> 0.6.2)
 
 DEPENDENCIES:
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
   Cartography: 70af183a248547694a8cfaa6b989cb7e04589985
   Hex: 1800bd20206b93b10422d2289baa3787698825ad
   Pages: 6c042132f8c63c34d242789b7763d4c64e9681a0
-  Presentation: 156bb732160bc092e3a288aa2c43a808a9a2d627
+  Presentation: ffc0ebd6775cf66071dc1b151848a67637cc8c05
 
 COCOAPODS: 0.39.0.beta.5
diff --git a/Example/Tutorial/Podfile.lock b/Example/Tutorial/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
   - Hex (2.0)
   - Pages (0.6.2)
   - Presentation (2.0.0):
-    - Cartography (~> 0.6.0)
+    - Cartography
     - Pages (~> 0.6.2)
 
 DEPENDENCIES:
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
   Pages:
     :git: https://github.com/hyperoslo/Pages
   Presentation:
-    :path: "../../"
+    :path: ../../
 
 CHECKOUT OPTIONS:
   Pages:
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
   Cartography: 70af183a248547694a8cfaa6b989cb7e04589985
   Hex: 1800bd20206b93b10422d2289baa3787698825ad
   Pages: 6c042132f8c63c34d242789b7763d4c64e9681a0
-  Presentation: 156bb732160bc092e3a288aa2c43a808a9a2d627
+  Presentation: ffc0ebd6775cf66071dc1b151848a67637cc8c05
 
-COCOAPODS: 0.39.0.beta.4
+COCOAPODS: 0.39.0.beta.5
diff --git a/Source/Animations/TransitionAnimation.swift b/Source/Animations/TransitionAnimation.swift
@@ -35,10 +35,10 @@ public class TransitionAnimation: NSObject, Animatable {
       delay: 0,
       usingSpringWithDamping: dumping,
       initialSpringVelocity: 0.5,
-      options: [.BeginFromCurrentState, .AllowUserInteraction, .LayoutSubviews],
+      options: [.BeginFromCurrentState, .AllowUserInteraction],
       animations: { [unowned self] in
         self.content.position = position
-        self.content.view.superview!.layoutIfNeeded()
+        self.content.animate()
       }, completion: nil)
 
     played = true
@@ -55,6 +55,8 @@ extension TransitionAnimation {
         let position = reflective ? startMirror : start
 
         content.position = position
+        content.animate()
+
         animateTo(destination)
       }
     }

diff --git a/Source/Content.swift b/Source/Content.swift
@@ -47,6 +47,10 @@ public class Content: NSObject {
       view.layoutIfNeeded()
     }
   }
+
+  public func animate() {
+    view.superview!.layoutIfNeeded()
+  }
 }
 
 extension Content {