Jumar Macato
8 years ago
No known key found for this signature in database
GPG Key ID: B19884DAC3A5BF3F
2 changed files with
1 additions and
2 deletions
-
src/Avalonia.Visuals/Animation/Animators/ColorAnimator.cs
-
src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
|
|
@ -32,6 +32,7 @@ namespace Avalonia.Animation.Animators |
|
|
|
|
|
|
|
|
public override Color Interpolate(double progress, Color oldValue, Color newValue) |
|
|
public override Color Interpolate(double progress, Color oldValue, Color newValue) |
|
|
{ |
|
|
{ |
|
|
|
|
|
// normalize sRGB values.
|
|
|
var oldA = oldValue.A / 255d; |
|
|
var oldA = oldValue.A / 255d; |
|
|
var oldR = oldValue.R / 255d; |
|
|
var oldR = oldValue.R / 255d; |
|
|
var oldG = oldValue.G / 255d; |
|
|
var oldG = oldValue.G / 255d; |
|
|
|
|
|
@ -27,8 +27,6 @@ namespace Avalonia.Animation.Animators |
|
|
|
|
|
|
|
|
public override IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete) |
|
|
public override IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete) |
|
|
{ |
|
|
{ |
|
|
var ctrl = (Visual)control; |
|
|
|
|
|
|
|
|
|
|
|
foreach (var keyframe in this) |
|
|
foreach (var keyframe in this) |
|
|
{ |
|
|
{ |
|
|
if (keyframe.Value as ISolidColorBrush == null) |
|
|
if (keyframe.Value as ISolidColorBrush == null) |
|
|
|
