Browse Source
Merge branch 'master' into fix-animation-triggers
pull/1885/head
Jumar Macato
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
11 additions and
11 deletions
-
src/Avalonia.Visuals/Animation/CrossFade.cs
-
src/Avalonia.Visuals/Animation/PageSlide.cs
|
|
|
@ -38,11 +38,11 @@ namespace Avalonia.Animation |
|
|
|
new Setter |
|
|
|
{ |
|
|
|
Property = Visual.OpacityProperty, |
|
|
|
Value = 0.0 |
|
|
|
Value = 0d |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(1.0) |
|
|
|
Cue = new Cue(1d) |
|
|
|
} |
|
|
|
}; |
|
|
|
_fadeInAnimation = new Animation |
|
|
|
@ -52,11 +52,11 @@ namespace Avalonia.Animation |
|
|
|
new Setter |
|
|
|
{ |
|
|
|
Property = Visual.OpacityProperty, |
|
|
|
Value = 0.0 |
|
|
|
Value = 0d |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(0.0) |
|
|
|
Cue = new Cue(0d) |
|
|
|
} |
|
|
|
}; |
|
|
|
_fadeOutAnimation.Duration = _fadeInAnimation.Duration = duration; |
|
|
|
|
|
|
|
@ -86,11 +86,11 @@ namespace Avalonia.Animation |
|
|
|
new Setter |
|
|
|
{ |
|
|
|
Property = translateProperty, |
|
|
|
Value = 0 |
|
|
|
Value = 0d |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(0.0) |
|
|
|
Cue = new Cue(0d) |
|
|
|
}, |
|
|
|
new KeyFrame |
|
|
|
( |
|
|
|
@ -101,7 +101,7 @@ namespace Avalonia.Animation |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(1.0) |
|
|
|
Cue = new Cue(1d) |
|
|
|
} |
|
|
|
}; |
|
|
|
animation.Duration = Duration; |
|
|
|
@ -119,22 +119,22 @@ namespace Avalonia.Animation |
|
|
|
new Setter |
|
|
|
{ |
|
|
|
Property = translateProperty, |
|
|
|
Value = forward ? -distance : distance |
|
|
|
Value = forward ? distance : -distance |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(0.0) |
|
|
|
Cue = new Cue(0d) |
|
|
|
}, |
|
|
|
new KeyFrame |
|
|
|
( |
|
|
|
new Setter |
|
|
|
{ |
|
|
|
Property = translateProperty, |
|
|
|
Value = 0 |
|
|
|
Value = 0d |
|
|
|
} |
|
|
|
) |
|
|
|
{ |
|
|
|
Cue = new Cue(1.0) |
|
|
|
Cue = new Cue(1d) |
|
|
|
}, |
|
|
|
}; |
|
|
|
animation.Duration = Duration; |
|
|
|
|