Browse Source

Merge pull request #141 from shahid-pk/issue-139

consistent names for xaml type converters
pull/143/head
Steven Kirk 11 years ago
parent
commit
51aec0902e
  1. 6
      src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
  2. 2
      src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
  3. 2
      src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs
  4. 2
      src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs
  5. 6
      src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

6
src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs

@ -80,12 +80,12 @@ namespace Perspex.Markup.Xaml.Context
var typeConverterProvider = new TypeConverterProvider(); var typeConverterProvider = new TypeConverterProvider();
var converters = new[] var converters = new[]
{ {
new TypeConverterRegistration(typeof(Bitmap), new BitmapConverter()), new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()),
new TypeConverterRegistration(typeof(Brush), new BrushConverter()), new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()),
new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()), new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()),
new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()), new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()),
new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()), new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()),
new TypeConverterRegistration(typeof(Thickness), new ThicknessConverter()), new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()),
}; };
typeConverterProvider.AddAll(converters); typeConverterProvider.AddAll(converters);

2
src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs

@ -8,7 +8,7 @@ using Perspex.Media.Imaging;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class BitmapConverter : ITypeConverter public class BitmapTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

2
src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs

@ -8,7 +8,7 @@ using Perspex.Media;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class BrushConverter : ITypeConverter public class BrushTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

2
src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs

@ -7,7 +7,7 @@ using OmniXaml.TypeConversion;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class ThicknessConverter : ITypeConverter public class ThicknessTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

6
src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@ -40,11 +40,11 @@
</Compile> </Compile>
<Compile Include="Converters\RowDefinitionsTypeConverter.cs" /> <Compile Include="Converters\RowDefinitionsTypeConverter.cs" />
<Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" /> <Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" />
<Compile Include="Converters\ThicknessConverter.cs" /> <Compile Include="Converters\ThicknessTypeConverter.cs" />
<Compile Include="Context\PerspexWiringContext.cs" /> <Compile Include="Context\PerspexWiringContext.cs" />
<Compile Include="MarkupExtensions\BindingExtension.cs" /> <Compile Include="MarkupExtensions\BindingExtension.cs" />
<Compile Include="Converters\BrushConverter.cs" /> <Compile Include="Converters\BrushTypeConverter.cs" />
<Compile Include="Converters\BitmapConverter.cs" /> <Compile Include="Converters\BitmapTypeConverter.cs" />
<Compile Include="Converters\GridLengthTypeConverter.cs" /> <Compile Include="Converters\GridLengthTypeConverter.cs" />
<Compile Include="DataBinding\ChangeTracking\ObservablePropertyBranch.cs" /> <Compile Include="DataBinding\ChangeTracking\ObservablePropertyBranch.cs" />
<Compile Include="DataBinding\ChangeTracking\PropertyMountPoint.cs" /> <Compile Include="DataBinding\ChangeTracking\PropertyMountPoint.cs" />

Loading…
Cancel
Save