diff options
| author | Dominique Louis <dolouis@microsoft.com> | 2019-10-10 19:56:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 19:56:20 +0300 |
| commit | 20568bdc43bccc2c9896e891508d761b705d7d6a (patch) | |
| tree | b1832df5b4da7681740444557c552a4e23539d2d /Xamarin.PropertyEditing.Tests | |
| parent | c366f9537724f73421feb80e80be3e45cd984777 (diff) | |
| parent | de1cc1d9b78864e5023d958b2d6f9e9aafe444b2 (diff) | |
Merge pull request #649 from xamarin/ermau-autoresizing
Windows Autoresizing Editor
Diffstat (limited to 'Xamarin.PropertyEditing.Tests')
| -rw-r--r-- | Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs | 4 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Tests/MockControls/MockSampleControl.cs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs b/Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs index 585bb7f..0302d6f 100644 --- a/Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs +++ b/Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs @@ -15,10 +15,10 @@ namespace Xamarin.PropertyEditing.Tests.MockControls bool canWrite = true, bool flag = false, IEnumerable<Type> converterTypes = null, string description = null, bool constrained = true, ValueSources valueSources = ValueSources.Local | ValueSources.Default | ValueSources.Binding, - IReadOnlyList<InputMode> inputModes = null, PropertyVariationOption[] options = null, bool isUncommon = false, ITypeInfo realType = null) + IReadOnlyList<InputMode> inputModes = null, PropertyVariationOption[] options = null, bool isUncommon = false, ITypeInfo realType = null, bool ignoreEnum = false) { IPropertyInfo propertyInfo; - if (typeof(T).IsEnum) { + if (typeof(T).IsEnum && !ignoreEnum) { var underlyingType = typeof (T).GetEnumUnderlyingType (); var enumPropertyInfoType = typeof (MockEnumPropertyInfo<,>) .MakeGenericType (underlyingType, typeof (T)); diff --git a/Xamarin.PropertyEditing.Tests/MockControls/MockSampleControl.cs b/Xamarin.PropertyEditing.Tests/MockControls/MockSampleControl.cs index 8fec0e1..a3c3d1f 100644 --- a/Xamarin.PropertyEditing.Tests/MockControls/MockSampleControl.cs +++ b/Xamarin.PropertyEditing.Tests/MockControls/MockSampleControl.cs @@ -11,6 +11,7 @@ namespace Xamarin.PropertyEditing.Tests.MockControls { public MockSampleControl () { + AddProperty<AutoResizingFlags> ("Autoresizing", ReadWrite, valueSources: ValueSources.Local, ignoreEnum: true); AddProperty<TimeSpan> ("TimeSpan", ReadWrite, valueSources: ValueSources.Local | ValueSources.Resource | ValueSources.Binding); AddProperty<TimeSpan> ("TimeSpanReadOnly", ReadOnly, canWrite: false, valueSources: ValueSources.Local | ValueSources.Resource | ValueSources.Binding); AddProperty<bool> ("Boolean", ReadWrite, valueSources: ValueSources.Local | ValueSources.Resource | ValueSources.Binding); |