Matrix.Parse & type converter

src/Avalonia.Visuals/Matrix.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using System.Linq;
 
 namespace Avalonia
 {
@@ -295,5 +296,33 @@ namespace Avalonia
                 ((_m21 * _m32) - (_m22 * _m31)) / d,
                 ((_m12 * _m31) - (_m11 * _m32)) / d);
         }
+
+        /// <summary>
+        /// Parses a <see cref="Matrix"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <param name="culture">The current culture.</param>
+        /// <returns>The <see cref="Thickness"/>.</returns>
+        public static Matrix Parse(string s, CultureInfo culture)
+        {
+            var parts = s.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x.Trim())
+                .ToArray();
+
+            if (parts.Length == 6)
+            {
+                return new Matrix(
+                    double.Parse(parts[0], culture), 
+                    double.Parse(parts[1], culture), 
+                    double.Parse(parts[2], culture), 
+                    double.Parse(parts[3], culture), 
+                    double.Parse(parts[4], culture), 
+                    double.Parse(parts[5], culture));
+            }
+            else
+            {
+                throw new FormatException("Invalid Matrix.");
+            }
+        }
     }
 }

src/Avalonia.Visuals/Point.cs

@@ -183,7 +183,7 @@ namespace Avalonia
             }
             else
             {
-                throw new FormatException("Invalid Thickness.");
+                throw new FormatException("Invalid Point.");
             }
         }
 

src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj

@@ -31,6 +31,7 @@
         </Compile>
         <Compile Include="AvaloniaXamlLoaderPortableXaml.cs" />
         <Compile Include="AvaloniaXamlLoader.cs" />
+        <Compile Include="Converters\MatrixTypeConverter.cs" />
         <Compile Include="Converters\SetterValueTypeConverter.cs" />
         <Compile Include="MarkupExtensions\StyleIncludeExtension.cs" />
         <Compile Include="PortableXaml\AvaloniaXamlContext.cs" />

src/Markup/Avalonia.Markup.Xaml/Converters/MatrixTypeConverter.cs

@@ -0,0 +1,23 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Globalization;
+
+namespace Avalonia.Markup.Xaml.Converters
+{
+	using System.ComponentModel;
+
+    public class MatrixTypeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return Matrix.Parse((string)value, culture);
+        }
+    }
+}

src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs

@@ -32,6 +32,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml
             { typeof(AvaloniaList<double>), typeof(AvaloniaListTypeConverter<double>) },
             { typeof(IMemberSelector), typeof(MemberSelectorTypeConverter) },
             { typeof(Point), typeof(PointTypeConverter) },
+            { typeof(Matrix), typeof(MatrixTypeConverter) },
             { typeof(IList<Point>), typeof(PointsListTypeConverter) },
             { typeof(AvaloniaProperty), typeof(AvaloniaPropertyTypeConverter) },
             { typeof(RelativePoint), typeof(RelativePointTypeConverter) },

tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs

@@ -0,0 +1,16 @@
+using System.Globalization;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media
+{
+    public class MatrixTests
+    {
+        [Fact]
+        public void Parse_Parses()
+        {
+            var matrix = Matrix.Parse("1,2,3,-4,5 6", CultureInfo.CurrentCulture);
+            var expected = new Matrix(1, 2, 3, -4, 5, 6);
+            Assert.Equal(expected, matrix);
+        }
+    }
+}