Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Motion
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Motion
Commits
9e63ef52
Unverified
Commit
9e63ef52
authored
Jun 14, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor tweaks before reworking broken view controller animations
parent
e5372859
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
27 deletions
+24
-27
Sources/MotionController.swift
+24
-27
No files found.
Sources/MotionController.swift
View file @
9e63ef52
...
...
@@ -276,20 +276,18 @@ public extension MotionController {
return
}
guard
let
a
=
animators
else
{
return
}
var
v
:
TimeInterval
=
0
for
x
in
a
{
var
t
=
elapsedTime
if
t
<
0
{
t
=
-
t
if
let
a
=
animators
{
for
x
in
a
{
var
t
=
elapsedTime
if
t
<
0
{
t
=
-
t
}
v
=
max
(
v
,
x
.
resume
(
at
:
t
*
totalDuration
,
isReversed
:
true
))
}
v
=
max
(
v
,
x
.
resume
(
at
:
t
*
totalDuration
,
isReversed
:
true
))
}
complete
(
after
:
v
,
isFinished
:
false
)
...
...
@@ -394,24 +392,22 @@ internal extension MotionController {
return
}
guard
let
tp
=
transitionPairs
else
{
return
}
for
x
in
tp
{
for
v
in
x
.
fromViews
{
context
.
hide
(
view
:
v
)
}
for
v
in
x
.
toViews
{
context
.
hide
(
view
:
v
)
if
let
tp
=
transitionPairs
{
for
x
in
tp
{
for
v
in
x
.
fromViews
{
context
.
hide
(
view
:
v
)
}
for
v
in
x
.
toViews
{
context
.
hide
(
view
:
v
)
}
}
}
var
t
:
TimeInterval
=
0
var
b
=
false
if
let
a
=
animators
{
if
let
a
=
animators
,
let
tp
=
transitionPairs
{
for
(
i
,
x
)
in
a
.
enumerated
()
{
let
d
=
x
.
animate
(
fromViews
:
tp
[
i
]
.
0
,
toViews
:
tp
[
i
]
.
1
)
...
...
@@ -440,7 +436,7 @@ internal extension MotionController {
*/
func
complete
(
after
:
TimeInterval
,
isFinished
:
Bool
)
{
guard
isTransitioning
else
{
fatalError
()
return
}
if
after
<=
0.001
{
...
...
@@ -449,9 +445,11 @@ internal extension MotionController {
}
let
v
=
(
isFinished
?
elapsedTime
:
1
-
elapsedTime
)
*
totalDuration
self
.
isFinished
=
isFinished
self
.
currentAnimationDuration
=
after
+
v
self
.
beginTime
=
CACurrentMediaTime
()
-
v
currentAnimationDuration
=
after
+
v
beginTime
=
CACurrentMediaTime
()
-
v
}
/**
...
...
@@ -461,7 +459,6 @@ internal extension MotionController {
*/
func
complete
(
isFinished
:
Bool
)
{
defer
{
animators
?
.
forEach
{
$0
.
clean
()
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment