Browse Source

Rename GradientBrushAnimator

pull/6183/head
Max Katz 5 years ago
parent
commit
8d0a4ff5ea
  1. 8
      src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
  2. 2
      src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
  3. 12
      src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs

8
src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs

@ -78,21 +78,21 @@ namespace Avalonia.Animation.Animators
return false; return false;
} }
var gradientAnimator = new IGradientBrushAnimator(); var gradientAnimator = new GradientBrushAnimator();
gradientAnimator.Property = Property; gradientAnimator.Property = Property;
foreach (var keyframe in this) foreach (var keyframe in this)
{ {
if (keyframe.Value is ISolidColorBrush solidColorBrush) if (keyframe.Value is ISolidColorBrush solidColorBrush)
{ {
gradientAnimator.Add(new AnimatorKeyFrame(typeof(IGradientBrushAnimator), keyframe.Cue, keyframe.KeySpline) gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
{ {
Value = IGradientBrushAnimator.ConvertSolidColorBrushToGradient(firstGradient, solidColorBrush) Value = GradientBrushAnimator.ConvertSolidColorBrushToGradient(firstGradient, solidColorBrush)
}); });
} }
else if (keyframe.Value is IGradientBrush) else if (keyframe.Value is IGradientBrush)
{ {
gradientAnimator.Add(new AnimatorKeyFrame(typeof(IGradientBrushAnimator), keyframe.Cue, keyframe.KeySpline) gradientAnimator.Add(new AnimatorKeyFrame(typeof(GradientBrushAnimator), keyframe.Cue, keyframe.KeySpline)
{ {
Value = keyframe.Value Value = keyframe.Value
}); });

2
src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs

@ -12,7 +12,7 @@ namespace Avalonia.Animation.Animators
/// <summary> /// <summary>
/// Animator that handles <see cref="SolidColorBrush"/> values. /// Animator that handles <see cref="SolidColorBrush"/> values.
/// </summary> /// </summary>
public class IGradientBrushAnimator : Animator<IGradientBrush?> public class GradientBrushAnimator : Animator<IGradientBrush?>
{ {
private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator(); private static readonly RelativePointAnimator s_relativePointAnimator = new RelativePointAnimator();
private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator(); private static readonly DoubleAnimator s_doubleAnimator = new DoubleAnimator();

12
src/Avalonia.Visuals/Animation/Transitions/BrushTransition.cs

@ -13,7 +13,7 @@ namespace Avalonia.Animation
/// </summary> /// </summary>
public class BrushTransition : Transition<IBrush?> public class BrushTransition : Transition<IBrush?>
{ {
private static readonly IGradientBrushAnimator s_gradientAnimator = new IGradientBrushAnimator(); private static readonly GradientBrushAnimator s_gradientAnimator = new GradientBrushAnimator();
private static readonly ISolidColorBrushAnimator s_solidColorBrushAnimator = new ISolidColorBrushAnimator(); private static readonly ISolidColorBrushAnimator s_solidColorBrushAnimator = new ISolidColorBrushAnimator();
public override IObservable<IBrush?> DoTransition(IObservable<double> progress, IBrush? oldValue, IBrush? newValue) public override IObservable<IBrush?> DoTransition(IObservable<double> progress, IBrush? oldValue, IBrush? newValue)
@ -27,18 +27,18 @@ namespace Avalonia.Animation
{ {
if (newValue is IGradientBrush newGradient) if (newValue is IGradientBrush newGradient)
{ {
return new AnimatorTransitionObservable<IGradientBrush?, IGradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, newGradient); return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, newGradient);
} }
else if (newValue is ISolidColorBrush newSolidColorBrushToConvert) else if (newValue is ISolidColorBrush newSolidColorBrushToConvert)
{ {
var convertedSolidColorBrush = IGradientBrushAnimator.ConvertSolidColorBrushToGradient(oldGradient, newSolidColorBrushToConvert); var convertedSolidColorBrush = GradientBrushAnimator.ConvertSolidColorBrushToGradient(oldGradient, newSolidColorBrushToConvert);
return new AnimatorTransitionObservable<IGradientBrush?, IGradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, convertedSolidColorBrush); return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, oldGradient, convertedSolidColorBrush);
} }
} }
else if (newValue is IGradientBrush newGradient && oldValue is ISolidColorBrush oldSolidColorBrushToConvert) else if (newValue is IGradientBrush newGradient && oldValue is ISolidColorBrush oldSolidColorBrushToConvert)
{ {
var convertedSolidColorBrush = IGradientBrushAnimator.ConvertSolidColorBrushToGradient(newGradient, oldSolidColorBrushToConvert); var convertedSolidColorBrush = GradientBrushAnimator.ConvertSolidColorBrushToGradient(newGradient, oldSolidColorBrushToConvert);
return new AnimatorTransitionObservable<IGradientBrush?, IGradientBrushAnimator>(s_gradientAnimator, progress, Easing, convertedSolidColorBrush, newGradient); return new AnimatorTransitionObservable<IGradientBrush?, GradientBrushAnimator>(s_gradientAnimator, progress, Easing, convertedSolidColorBrush, newGradient);
} }
if (oldValue is ISolidColorBrush oldSolidColorBrush && newValue is ISolidColorBrush newSolidColorBrush) if (oldValue is ISolidColorBrush oldSolidColorBrush && newValue is ISolidColorBrush newSolidColorBrush)

Loading…
Cancel
Save