Add Transform property for Brush class

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

@@ -30,6 +30,7 @@ public class GradientBrushAnimator : Animator<IGradientBrush?>
                     return new ImmutableRadialGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform,
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
                         s_relativePointAnimator.Interpolate(progress, oldRadial.GradientOrigin, newRadial.GradientOrigin),
@@ -39,6 +40,7 @@ public class GradientBrushAnimator : Animator<IGradientBrush?>
                     return new ImmutableConicGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform,
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
                         s_doubleAnimator.Interpolate(progress, oldConic.Angle, newConic.Angle));
@@ -47,6 +49,7 @@ public class GradientBrushAnimator : Animator<IGradientBrush?>
                     return new ImmutableLinearGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
+                        oldValue.Transform,
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
                         s_relativePointAnimator.Interpolate(progress, oldLinear.EndPoint, newLinear.EndPoint));
@@ -93,16 +96,19 @@ internal static IGradientBrush ConvertSolidColorBrushToGradient(IGradientBrush g
                 case IRadialGradientBrush oldRadial:
                     return new ImmutableRadialGradientBrush(
                         CreateStopsFromSolidColorBrush(solidColorBrush, oldRadial.GradientStops), solidColorBrush.Opacity,
+                        oldRadial.Transform,
                         oldRadial.SpreadMethod, oldRadial.Center, oldRadial.GradientOrigin, oldRadial.Radius);
 
                 case IConicGradientBrush oldConic:
                     return new ImmutableConicGradientBrush(
                         CreateStopsFromSolidColorBrush(solidColorBrush, oldConic.GradientStops), solidColorBrush.Opacity,
+                        oldConic.Transform,
                         oldConic.SpreadMethod, oldConic.Center, oldConic.Angle);
 
                 case ILinearGradientBrush oldLinear:
                     return new ImmutableLinearGradientBrush(
                         CreateStopsFromSolidColorBrush(solidColorBrush, oldLinear.GradientStops), solidColorBrush.Opacity,
+                        oldLinear.Transform,
                         oldLinear.SpreadMethod, oldLinear.StartPoint, oldLinear.EndPoint);
 
                 default:

src/Avalonia.Visuals/ApiCompatBaseline.txt

@@ -5,7 +5,15 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Task
 MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IPageTransition.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
 MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.PageSlide.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.ITransform Avalonia.Media.IBrush.Transform' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.ITransform Avalonia.Media.IBrush.Transform.get()' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.ITransform Avalonia.Media.IMutableTransform.ToImmutable()' is present in the implementation but not in the contract.
+MembersMustExist : Member 'public void Avalonia.Media.Immutable.ImmutableConicGradientBrush..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.Immutable.ImmutableGradientStop>, System.Double, Avalonia.Media.GradientSpreadMethod, System.Nullable<Avalonia.RelativePoint>, System.Double)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Immutable.ImmutableGradientBrush..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.Immutable.ImmutableGradientStop>, System.Double, Avalonia.Media.GradientSpreadMethod)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Media.Immutable.ImmutableLinearGradientBrush..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.Immutable.ImmutableGradientStop>, System.Double, Avalonia.Media.GradientSpreadMethod, System.Nullable<Avalonia.RelativePoint>, System.Nullable<Avalonia.RelativePoint>)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Media.Immutable.ImmutableRadialGradientBrush..ctor(System.Collections.Generic.IReadOnlyList<Avalonia.Media.Immutable.ImmutableGradientStop>, System.Double, Avalonia.Media.GradientSpreadMethod, System.Nullable<Avalonia.RelativePoint>, System.Nullable<Avalonia.RelativePoint>, System.Double)' does not exist in the implementation but it does exist in the contract.
 TypeCannotChangeClassification : Type 'Avalonia.Media.Immutable.ImmutableSolidColorBrush' is a 'class' in the implementation but is a 'struct' in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Immutable.ImmutableTileBrush..ctor(Avalonia.Media.AlignmentX, Avalonia.Media.AlignmentY, Avalonia.RelativeRect, System.Double, Avalonia.RelativeRect, Avalonia.Media.Stretch, Avalonia.Media.TileMode, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
 CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
 CannotSealType : Type 'Avalonia.Media.TextFormatting.GenericTextParagraphProperties' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
@@ -74,4 +82,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWr
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.String)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToHeight(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToWidth(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-Total Issues: 75
+Total Issues: 83

src/Avalonia.Visuals/Media/Brush.cs

@@ -18,13 +18,19 @@ public abstract class Brush : Animatable, IMutableBrush
         public static readonly StyledProperty<double> OpacityProperty =
             AvaloniaProperty.Register<Brush, double>(nameof(Opacity), 1.0);
 
+        /// <summary>
+        /// Defines the <see cref="Transform"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITransform> TransformProperty =
+            AvaloniaProperty.Register<Brush, ITransform>(nameof(Transform));
+
         /// <inheritdoc/>
         public event EventHandler Invalidated;
 
         static Brush()
         {
             Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
-            AffectsRender<Brush>(OpacityProperty);
+            AffectsRender<Brush>(OpacityProperty, TransformProperty);
         }
 
         /// <summary>
@@ -36,6 +42,15 @@ public double Opacity
             set { SetValue(OpacityProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the transform of the brush.
+        /// </summary>
+        public ITransform Transform
+        {
+            get { return GetValue(TransformProperty); }
+            set { SetValue(TransformProperty, value); }
+        }
+
         /// <summary>
         /// Parses a brush string.
         /// </summary>

src/Avalonia.Visuals/Media/IBrush.cs

@@ -12,5 +12,10 @@ public interface IBrush
         /// Gets the opacity of the brush.
         /// </summary>
         double Opacity { get; }
+
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        ITransform Transform { get; }
     }
 }

src/Avalonia.Visuals/Media/IMutableTransform.cs

@@ -8,5 +8,11 @@ public interface IMutableTransform : ITransform
         /// Raised when the transform changes.
         /// </summary>
         event EventHandler Changed;
+
+        /// <summary>
+        /// Converts a transform to an immutable transform.
+        /// </summary>
+        /// <returns>The immutable transform</returns>
+        ITransform ToImmutable();
     }
 }

src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs

@@ -12,16 +12,18 @@ public class ImmutableConicGradientBrush : ImmutableGradientBrush, IConicGradien
         /// </summary>
         /// <param name="gradientStops">The gradient stops.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="spreadMethod">The spread method.</param>
         /// <param name="center">The center point for the gradient.</param>
         /// <param name="angle">The starting angle for the gradient.</param>
         public ImmutableConicGradientBrush(
             IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity = 1,
+            ITransform transform = null,
             GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
             RelativePoint? center = null,
             double angle = 0)
-            : base(gradientStops, opacity, spreadMethod)
+            : base(gradientStops, opacity, transform, spreadMethod)
         {
             Center = center ?? RelativePoint.Center;
             Angle = angle;

src/Avalonia.Visuals/Media/Immutable/ImmutableGradientBrush.cs

@@ -12,14 +12,17 @@ public abstract class ImmutableGradientBrush : IGradientBrush
         /// </summary>
         /// <param name="gradientStops">The gradient stops.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="spreadMethod">The spread method.</param>
         protected ImmutableGradientBrush(
             IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity,
+            ITransform transform,
             GradientSpreadMethod spreadMethod)
         {
             GradientStops = gradientStops;
             Opacity = opacity;
+            Transform = transform;
             SpreadMethod = spreadMethod;
         }
 
@@ -28,7 +31,7 @@ protected ImmutableGradientBrush(
         /// </summary>
         /// <param name="source">The brush from which this brush's properties should be copied.</param>
         protected ImmutableGradientBrush(GradientBrush source)
-            : this(source.GradientStops.ToImmutable(), source.Opacity, source.SpreadMethod)
+            : this(source.GradientStops.ToImmutable(), source.Opacity, source.Transform.ToImmutable(), source.SpreadMethod)
         {
 
         }
@@ -39,6 +42,11 @@ protected ImmutableGradientBrush(GradientBrush source)
         /// <inheritdoc/>
         public double Opacity { get; }
 
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform Transform { get; }
+
         /// <inheritdoc/>
         public GradientSpreadMethod SpreadMethod { get; }
     }

src/Avalonia.Visuals/Media/Immutable/ImmutableImageBrush.cs

@@ -16,6 +16,7 @@ internal class ImmutableImageBrush : ImmutableTileBrush, IImageBrush
         /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
         /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
         /// <param name="stretch">
         /// How the source rectangle will be stretched to fill the destination rect.
@@ -28,6 +29,7 @@ public ImmutableImageBrush(
             AlignmentY alignmentY = AlignmentY.Center,
             RelativeRect? destinationRect = null,
             double opacity = 1,
+            ITransform transform = null,
             RelativeRect? sourceRect = null,
             Stretch stretch = Stretch.Uniform,
             TileMode tileMode = TileMode.None,
@@ -37,6 +39,7 @@ public ImmutableImageBrush(
                   alignmentY,
                   destinationRect ?? RelativeRect.Fill,
                   opacity,
+                  transform,
                   sourceRect ?? RelativeRect.Fill,
                   stretch,
                   tileMode,

src/Avalonia.Visuals/Media/Immutable/ImmutableLinearGradientBrush.cs

@@ -12,16 +12,18 @@ public class ImmutableLinearGradientBrush : ImmutableGradientBrush, ILinearGradi
         /// </summary>
         /// <param name="gradientStops">The gradient stops.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="spreadMethod">The spread method.</param>
         /// <param name="startPoint">The start point for the gradient.</param>
         /// <param name="endPoint">The end point for the gradient.</param>
         public ImmutableLinearGradientBrush(
             IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity = 1,
+            ITransform transform = null,
             GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
             RelativePoint? startPoint = null,
             RelativePoint? endPoint = null)
-            : base(gradientStops, opacity, spreadMethod)
+            : base(gradientStops, opacity, transform, spreadMethod)
         {
             StartPoint = startPoint ?? RelativePoint.TopLeft;
             EndPoint = endPoint ?? RelativePoint.BottomRight;

src/Avalonia.Visuals/Media/Immutable/ImmutableRadialGradientBrush.cs

@@ -12,6 +12,7 @@ public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradi
         /// </summary>
         /// <param name="gradientStops">The gradient stops.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="spreadMethod">The spread method.</param>
         /// <param name="center">The start point for the gradient.</param>
         /// <param name="gradientOrigin">
@@ -23,11 +24,12 @@ public class ImmutableRadialGradientBrush : ImmutableGradientBrush, IRadialGradi
         public ImmutableRadialGradientBrush(
             IReadOnlyList<ImmutableGradientStop> gradientStops,
             double opacity = 1,
+            ITransform transform = null,
             GradientSpreadMethod spreadMethod = GradientSpreadMethod.Pad,
             RelativePoint? center = null,
             RelativePoint? gradientOrigin = null,
             double radius = 0.5)
-            : base(gradientStops, opacity, spreadMethod)
+            : base(gradientStops, opacity, transform, spreadMethod)
         {
             Center = center ?? RelativePoint.Center;
             GradientOrigin = gradientOrigin ?? RelativePoint.Center;

src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs

@@ -46,11 +46,16 @@ public ImmutableSolidColorBrush(ISolidColorBrush source)
         /// </summary>
         public double Opacity { get; }
 
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform Transform { get; }
+
         public bool Equals(ImmutableSolidColorBrush other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity);
+            return Color.Equals(other.Color) && Opacity.Equals(other.Opacity) && (Transform == null && other.Transform == null ? true : Transform.Equals(other.Transform));
         }
 
         public override bool Equals(object obj)
@@ -62,7 +67,7 @@ public override int GetHashCode()
         {
             unchecked
             {
-                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode();
+                return (Color.GetHashCode() * 397) ^ Opacity.GetHashCode() ^ (Transform is null ? 0 : Transform.GetHashCode());
             }
         }
 

src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs

@@ -14,6 +14,7 @@ public abstract class ImmutableTileBrush : ITileBrush
         /// <param name="alignmentY">The vertical alignment of a tile in the destination.</param>
         /// <param name="destinationRect">The rectangle on the destination in which to paint a tile.</param>
         /// <param name="opacity">The opacity of the brush.</param>
+        /// <param name="transform">The transform of the brush.</param>
         /// <param name="sourceRect">The rectangle of the source image that will be displayed.</param>
         /// <param name="stretch">
         /// How the source rectangle will be stretched to fill the destination rect.
@@ -25,6 +26,7 @@ protected ImmutableTileBrush(
             AlignmentY alignmentY,
             RelativeRect destinationRect,
             double opacity,
+            ITransform transform,
             RelativeRect sourceRect,
             Stretch stretch,
             TileMode tileMode,
@@ -34,6 +36,7 @@ protected ImmutableTileBrush(
             AlignmentY = alignmentY;
             DestinationRect = destinationRect;
             Opacity = opacity;
+            Transform = transform;
             SourceRect = sourceRect;
             Stretch = stretch;
             TileMode = tileMode;
@@ -50,6 +53,7 @@ protected ImmutableTileBrush(ITileBrush source)
                   source.AlignmentY,
                   source.DestinationRect,
                   source.Opacity,
+                  source.Transform.ToImmutable(),
                   source.SourceRect,
                   source.Stretch,
                   source.TileMode,
@@ -69,6 +73,11 @@ protected ImmutableTileBrush(ITileBrush source)
         /// <inheritdoc/>
         public double Opacity { get; }
 
+        /// <summary>
+        /// Gets the transform of the brush.
+        /// </summary>
+        public ITransform Transform { get; }
+
         /// <inheritdoc/>
         public RelativeRect SourceRect { get; }