[Core] Use a Task result for type request

This allows for a request to be answered in the future, preventing the
implementing UI to have to block for a response during the event
request. Primarily used to support Mac as it uses popovers rather than
whole windows.

2 files changed, 4 insertions, 2 deletions

diff --git a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml.cs b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml.cs
index 097eab7..cc2ccd7 100644
--- a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml.cs
+++ b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Threading.Tasks;
 using System.Windows;
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -39,7 +40,7 @@ namespace Xamarin.PropertyEditing.Windows
 
 		private void OnTypeRequested (object sender, TypeRequestedEventArgs args)
 		{
-			args.SelectedType = TypeSelectorWindow.RequestType (this, ((CollectionPropertyViewModel)DataContext).AssignableTypes);
+			args.SelectedType = Task.FromResult (TypeSelectorWindow.RequestType (this, ((CollectionPropertyViewModel)DataContext).AssignableTypes));
 		}
 
 		private void OnOkClick (object sender, RoutedEventArgs e)
diff --git a/Xamarin.PropertyEditing.Windows/ObjectEditorControl.cs b/Xamarin.PropertyEditing.Windows/ObjectEditorControl.cs
index eec3c44..c9817d2 100644
--- a/Xamarin.PropertyEditing.Windows/ObjectEditorControl.cs
+++ b/Xamarin.PropertyEditing.Windows/ObjectEditorControl.cs
@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using System.Windows;
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -35,7 +36,7 @@ namespace Xamarin.PropertyEditing.Windows
 			var panel = this.FindPropertiesHost ();
 
 			ITypeInfo type = TypeSelectorWindow.RequestType (panel, vsender.AssignableTypes);
-			e.SelectedType = type;
+			e.SelectedType = Task.FromResult (type);
 		}
 	}
 }