Complete View.Model attached property

Stylet/MainViewModel.cs

@@ -16,6 +16,6 @@ namespace Stylet
 
     class SubViewModel
     {
-
+        public string Testy { get { return "Testy"; } }
     }
 }

Stylet/Stylet.csproj

@@ -53,6 +53,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="SubView.xaml.cs">
+      <DependentUpon>SubView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
@@ -72,6 +75,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="SubView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

Stylet/SubView.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="Stylet.SubView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+        <TextBlock Text="{Binding Testy}"/>
+    </Grid>
+</UserControl>

Stylet/SubView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Stylet
+{
+    /// <summary>
+    /// Interaction logic for SubView.xaml
+    /// </summary>
+    public partial class SubView : UserControl
+    {
+        public SubView()
+        {
+            InitializeComponent();
+        }
+    }
+}

Stylet/View.cs

@@ -1,14 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Markup;
 
 namespace Stylet
 {
     public class View : DependencyObject
     {
+        static readonly ContentPropertyAttribute DefaultContentProperty = new ContentPropertyAttribute("Content");
+
         public static object GetTarget(DependencyObject obj)
         {
             return (object)obj.GetValue(TargetProperty);
@@ -48,7 +52,22 @@ namespace Stylet
             if (e.NewValue != null)
             {
                 var view = ViewLocator.LocateForModel(e.NewValue);
+                ViewModelBinder.Bind(view, e.NewValue);
+
+                SetContentProperty(targetLocation, view);
             }
+            else
+            {
+                SetContentProperty(targetLocation, null);
+            }
+        }
+
+        private static void SetContentProperty(DependencyObject targetLocation, UIElement view)
+        {
+            var type = targetLocation.GetType();
+            var contentProperty = Attribute.GetCustomAttributes(type, true).OfType<ContentPropertyAttribute>().FirstOrDefault() ?? DefaultContentProperty;
+
+            type.GetProperty(contentProperty.Name).SetValue(targetLocation, view, null);
         }
     }
 }

Stylet/ViewLocator.cs

@@ -15,19 +15,22 @@ namespace Stylet
         {
             var modelName = model.GetType().FullName;
             var viewName = Regex.Replace(modelName, @"ViewModel", "View");
-            var viewType = Assembly.GetEntryAssembly().GetType(modelName);
+            var viewType = Assembly.GetEntryAssembly().GetType(viewName);
+
             if (viewType == null)
                 throw new Exception(String.Format("Unable to find a View with type {0}", viewName));
 
-            var instance = Activator.CreateInstance(viewType);
-            if (!(instance is UIElement))
-                throw new Exception(String.Format("Managed to create a {0}, but it wasn't a UIElement", viewName));
+            if (viewType.IsInterface || viewType.IsAbstract || !typeof(UIElement).IsAssignableFrom(viewType))
+                throw new Exception(String.Format("Found type for view : {0}, but it wasn't a class derived from UIElement", viewType.Name));
 
+            var view = (UIElement)Activator.CreateInstance(viewType);
+
+            // If it doesn't have a code-behind, this won't be called
             var initializer = viewType.GetMethod("InitializeComponent", BindingFlags.Public | BindingFlags.Instance);
             if (initializer != null)
-                initializer.Invoke(instance, null);
+                initializer.Invoke(view, null);
 
-            return (UIElement)instance;
+            return (UIElement)view;
         }
     }
 }

Stylet/ViewModelBinder.cs

@@ -9,10 +9,13 @@ namespace Stylet
 {
     public static class ViewModelBinder
     {
-        public static void Bind(FrameworkElement view, object viewModel)
+        public static void Bind(DependencyObject view, object viewModel)
         {
-            view.DataContext = viewModel;
             View.SetTarget(view, viewModel);
+
+            var viewAsFrameworkElement = view as FrameworkElement;
+            if (viewAsFrameworkElement != null)
+                viewAsFrameworkElement.DataContext = viewModel;
         }
     }
 }