From 099feb1f2c2d0bd0b4a966d9dd57629547bf9b57 Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Thu, 28 May 2020 21:41:09 +0800 Subject: [PATCH] remove hacks --- src/Avalonia.Visuals/Media/Color.cs | 1 - .../Media/ColorToSolidColorBrushConverter.cs | 36 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs index acacbaac36..85808698f9 100644 --- a/src/Avalonia.Visuals/Media/Color.cs +++ b/src/Avalonia.Visuals/Media/Color.cs @@ -8,7 +8,6 @@ namespace Avalonia.Media /// /// An ARGB color. /// - [TypeConverter(typeof(ColorToSolidColorBrushConverter))] public readonly struct Color : IEquatable { static Color() diff --git a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs deleted file mode 100644 index fa8603c536..0000000000 --- a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Globalization; -using System.Linq; -using Avalonia.Media.Immutable; - -namespace Avalonia.Media -{ - internal class ColorToSolidColorBrushConverter : TypeConverter - { - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - return Color.Parse((string)value); - } - public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) - { - return typeof(IBrush).IsAssignableFrom(destinationType); - } - - public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) - { - if (typeof(IBrush).IsAssignableFrom(destinationType)) - { - return new ImmutableSolidColorBrush((Color)value); - } - - return null; - } - } -} \ No newline at end of file