1
1
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 13:15:35 +03:00

More general case of node animation adding

This commit is contained in:
Victor Sukochev 2016-09-19 14:18:01 +06:00
parent 14bd5d8b6d
commit 7b57a045ac

View File

@ -19,7 +19,10 @@ public class MacawView: UIView {
if let cache = animationCache {
self.renderer = RenderUtils.createNodeRenderer(node, context: context, animationCache: cache)
}
animationProducer.addStoredAnimations(node)
if let _ = superview {
animationProducer.addStoredAnimations(node)
}
}
}
@ -33,11 +36,6 @@ public class MacawView: UIView {
return
}
if !nodeAddedViaInit {
return
}
nodeAddedViaInit = false
animationProducer.addStoredAnimations(node)
}
}
@ -45,16 +43,11 @@ public class MacawView: UIView {
override public func didMoveToSuperview() {
super.didMoveToSuperview()
if !nodeAddedViaInit {
return
}
if !frameSetFirstTime {
return
}
nodeAddedViaInit = false
animationProducer.addStoredAnimations(node)
}
@ -64,7 +57,6 @@ public class MacawView: UIView {
var renderer: NodeRenderer?
var toRender = true
var nodeAddedViaInit = false
var frameSetFirstTime = false
internal var animationCache: AnimationCache?
@ -82,8 +74,6 @@ public class MacawView: UIView {
self.renderer = RenderUtils.createNodeRenderer(node, context: context, animationCache: cache)
}
nodeAddedViaInit = true
let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(MacawView.handlePan))
let rotationRecognizer = UIRotationGestureRecognizer(target: self, action: #selector(MacawView.handleRotation))
let pinchRecognizer = UIPinchGestureRecognizer(target: self, action: #selector(MacawView.handlePinch))