diff options
author | Eric Maupin <ermaup@microsoft.com> | 2019-03-06 22:50:00 +0300 |
---|---|---|
committer | Eric Maupin <ermaup@microsoft.com> | 2019-03-06 22:50:02 +0300 |
commit | 3eb26f865ffa2a776b170de0c30d0acb9a6911f8 (patch) | |
tree | 4459a246217254bf5157479f9c7da1a346d8c4dc /Xamarin.PropertyEditing.Mac/Controls/RequestResource | |
parent | 1976b1280ef6c8386ba7119b8dab02e01c13c61f (diff) |
[mac] Fix resource selection on non-brushes
Originally it was trying to use the ResourceSelector property from BrushPropertyViewModel
but that's intended for a resource request, it's for the inline resource selector. In
trying to do this it didn't do proper null checks for the property, so it'd crash when
it inevitably wasn't found.
Diffstat (limited to 'Xamarin.PropertyEditing.Mac/Controls/RequestResource')
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs index 607d453..bee3e70 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs @@ -75,14 +75,7 @@ namespace Xamarin.PropertyEditing.Mac var vmType = propertyViewModel.GetType (); var valuePropertyInfo = vmType.GetProperty ("Value"); var resourceValue = valuePropertyInfo.GetValue (propertyViewModel); - var resourceSelectorPropertyInfo = vmType.GetProperty ("ResourceSelector"); - var resourceSelector = resourceSelectorPropertyInfo.GetValue (propertyViewModel) as ResourceSelectorViewModel; - - if (resourceSelector != null) { - this.resourceSelectorPanel = new RequestResourcePanel (HostResources, resourceSelector, resourceValue); - } else { - this.resourceSelectorPanel = new RequestResourcePanel (HostResources, new ResourceSelectorViewModel (propertyViewModel.TargetPlatform.ResourceProvider, propertyViewModel.Editors.Select (ed => ed.Target), propertyViewModel.Property), resourceValue); - } + this.resourceSelectorPanel = new RequestResourcePanel (HostResources, new ResourceSelectorViewModel (propertyViewModel.TargetPlatform.ResourceProvider, propertyViewModel.Editors.Select (ed => ed.Target), propertyViewModel.Property), resourceValue); this.resourceSelectorPanel.ResourceSelected += (sender, e) => { propertyViewModel.Resource = this.resourceSelectorPanel.SelectedResource; }; |