exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-11-09 20:03:05 +03:00
Code Issues Projects Releases Wiki Activity

Common animation states fixes

Browse Source
This commit is contained in:
Viktor Sukochev 2017-02-20 16:51:12 +07:00
parent 9ad98cce1e
commit 8d19a32442
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MacawTests/Animation/CombineAnimationTests.swift
View File

@ -49,6 +49,7 @@ class CombineAnimationTests: XCTestCase {
animation.pause()
XCTAssert(animation.paused && anim1.paused && anim2.paused && anim3.paused, "Inner animations incorrect state: pause")
XCTAssert(!animation.manualStop && !anim1.manualStop && !anim2.manualStop && !anim3.manualStop, "Inner animations incorrect state: pause")
XCTAssert(testGroup.place.dx != 0.0, "Transform animation wrong node state on pause")
animation.play()
@ -64,8 +65,9 @@ class CombineAnimationTests: XCTestCase {
XCTAssertNil(error, "Async test failed")
}
XCTAssert(animation.manualStop && anim1.manualStop && anim2.manualStop && anim3.manualStop, "Inner animations incorrect state: pause")
// XCTAssert(testGroup.place.dx == 0.0, "Transform animation wrong node state on stop")
XCTAssert(animation.manualStop && anim1.manualStop && anim2.manualStop && anim3.manualStop, "Inner animations incorrect state: stop")
XCTAssert(!animation.paused && !anim1.paused && !anim2.paused && !anim3.paused, "Inner animations incorrect state: stop")
XCTAssert(testGroup.place.dx == 0.0, "Transform animation wrong node state on stop")
}
}

2
Source/animation/AnimationImpl.swift
View File

@ -86,11 +86,13 @@ class BasicAnimation: Animation {
override open func stop() {
manualStop = true
paused = false
removeFunc?()
}
override open func pause() {
paused = true
manualStop = false
removeFunc?()
}