Renamed ControlTemplate -> FuncControlTemplate

samples/TestApplication/GalleryStyle.cs

@@ -23,7 +23,7 @@ namespace TestApplication
                 {
                     Setters = new[]
                     {
-                        new Setter (TemplatedControl.TemplateProperty, new ControlTemplate<TabControl> (TabControlTemplate))
+                        new Setter (TemplatedControl.TemplateProperty, new FuncControlTemplate<TabControl> (TabControlTemplate))
                     }
                 },
 
@@ -31,7 +31,7 @@ namespace TestApplication
                 {
                     Setters = new[]
                     {
-                        new Setter (TemplatedControl.TemplateProperty, new ControlTemplate<TabItem> (TabItemTemplate)),
+                        new Setter (TemplatedControl.TemplateProperty, new FuncControlTemplate<TabItem> (TabItemTemplate)),
                     }
                 },
 

src/Perspex.Controls/Perspex.Controls.csproj

@@ -72,7 +72,7 @@
     <Compile Include="Primitives\Popup.cs" />
     <Compile Include="Primitives\ScrollInfoAdapter.cs" />
     <Compile Include="Canvas.cs" />
-    <Compile Include="Templates\ControlTemplate`2.cs" />
+    <Compile Include="Templates\FuncControlTemplate`2.cs" />
     <Compile Include="Templates\FuncDataTemplate`1.cs" />
     <Compile Include="Templates\FuncMemberSelector.cs" />
     <Compile Include="Templates\IControlTemplate.cs" />
@@ -101,7 +101,7 @@
     <Compile Include="Control.cs" />
     <Compile Include="ControlExtensions.cs" />
     <Compile Include="Controls.cs" />
-    <Compile Include="Templates\ControlTemplate.cs" />
+    <Compile Include="Templates\FuncControlTemplate.cs" />
     <Compile Include="Templates\DataTemplateExtensions.cs" />
     <Compile Include="Templates\FuncDataTemplate.cs" />
     <Compile Include="Generators\TreeItemContainerGenerator.cs" />

src/Perspex.Controls/Primitives/TemplatedControl.cs

@@ -69,8 +69,8 @@ namespace Perspex.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="TemplateProperty"/> property.
         /// </summary>
-        public static readonly PerspexProperty<ControlTemplate> TemplateProperty =
-            PerspexProperty.Register<TemplatedControl, ControlTemplate>("Template");
+        public static readonly PerspexProperty<FuncControlTemplate> TemplateProperty =
+            PerspexProperty.Register<TemplatedControl, FuncControlTemplate>("Template");
 
         private bool _templateApplied;
 
@@ -177,7 +177,7 @@ namespace Perspex.Controls.Primitives
         /// <summary>
         /// Gets or sets the template that defines the control's appearance.
         /// </summary>
-        public ControlTemplate Template
+        public FuncControlTemplate Template
         {
             get { return GetValue(TemplateProperty); }
             set { SetValue(TemplateProperty, value); }

src/Perspex.Controls/Templates/ControlTemplate.cs → src/Perspex.Controls/Templates/FuncControlTemplate.cs

@@ -10,13 +10,13 @@ namespace Perspex.Controls.Templates
     /// <summary>
     /// A template for a <see cref="TemplatedControl"/>.
     /// </summary>
-    public class ControlTemplate : FuncTemplate<ITemplatedControl, IControl>, IControlTemplate
+    public class FuncControlTemplate : FuncTemplate<ITemplatedControl, IControl>, IControlTemplate
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ControlTemplate"/> class.
+        /// Initializes a new instance of the <see cref="FuncControlTemplate"/> class.
         /// </summary>
         /// <param name="build">The build function.</param>
-        public ControlTemplate(Func<ITemplatedControl, IControl> build)
+        public FuncControlTemplate(Func<ITemplatedControl, IControl> build)
             : base(build)
         {
         }

src/Perspex.Controls/Templates/ControlTemplate`2.cs → src/Perspex.Controls/Templates/FuncControlTemplate`2.cs

@@ -11,13 +11,13 @@ namespace Perspex.Controls.Templates
     /// A template for a <see cref="TemplatedControl"/>.
     /// </summary>
     /// <typeparam name="T">The type of the lookless control.</typeparam>
-    public class ControlTemplate<T> : ControlTemplate where T : ITemplatedControl
+    public class FuncControlTemplate<T> : FuncControlTemplate where T : ITemplatedControl
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ControlTemplate{T}"/> class.
+        /// Initializes a new instance of the <see cref="FuncControlTemplate{T}"/> class.
         /// </summary>
         /// <param name="build">The build function.</param>
-        public ControlTemplate(Func<T, IControl> build)
+        public FuncControlTemplate(Func<T, IControl> build)
             : base(x => build((T)x))
         {
         }

src/Perspex.Themes.Default/ButtonStyle.cs

@@ -35,7 +35,7 @@ namespace Perspex.Themes.Default
                         new Setter(TemplatedControl.BorderThicknessProperty, 2),
                         new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(0xff000000)),
                         new Setter(Control.FocusAdornerProperty, new FuncTemplate<IControl>(FocusAdornerTemplate)),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Button>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Button>(Template)),
                         new Setter(ContentControl.HorizontalContentAlignmentProperty, HorizontalAlignment.Center),
                         new Setter(ContentControl.VerticalContentAlignmentProperty, VerticalAlignment.Center),
                     },

src/Perspex.Themes.Default/CarouselStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Carousel>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Carousel>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/CheckBoxStyle.cs

@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<CheckBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<CheckBox>(Template)),
                     },
                 },
                 new Style(x => x.OfType<CheckBox>().Template().Name("checkMark"))

src/Perspex.Themes.Default/ContentControlStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ContentControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ContentControl>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/DropDownStyle.cs

@@ -33,7 +33,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<DropDown>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<DropDown>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xff707070)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),
                         new Setter(Control.FocusAdornerProperty, new FuncTemplate<IControl>(FocusAdornerTemplate)),

src/Perspex.Themes.Default/GridSplitterStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<GridSplitter>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<GridSplitter>(Template)),
                         new Setter(Layoutable.WidthProperty, 4.0),
                     },
                 },

src/Perspex.Themes.Default/ItemsControlStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ItemsControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ItemsControl>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/ListBoxItemStyle.cs

@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ListBoxItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ListBoxItem>(Template)),
                     },
                 },
                 new Style(x => x.OfType<ListBoxItem>().Class(":selected").Template().Name("border"))

src/Perspex.Themes.Default/ListBoxStyle.cs

@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ListBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ListBox>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Black),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                     },

src/Perspex.Themes.Default/MenuItemStyle.cs

@@ -37,14 +37,14 @@ namespace Perspex.Themes.Default
                     {
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                         new Setter(TemplatedControl.PaddingProperty, new Thickness(6, 0)),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<MenuItem>(PopupTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<MenuItem>(PopupTemplate)),
                     },
                 },
                 new Style(x => x.OfType<Menu>().Child().OfType<MenuItem>())
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<MenuItem>(TopLevelTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<MenuItem>(TopLevelTemplate)),
                     },
                 },
                 new Style(x => x.OfType<MenuItem>().Class(":selected").Template().Name("root"))

src/Perspex.Themes.Default/MenuStyle.cs

@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Menu>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Menu>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/PopupRootStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<PopupRoot>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<PopupRoot>(Template)),
                         new Setter(TemplatedControl.FontFamilyProperty, "Segoe UI"),
                         new Setter(TemplatedControl.FontSizeProperty, 12.0),
                     },

src/Perspex.Themes.Default/ProgressBarStyle.cs

@@ -32,7 +32,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ProgressBar>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ProgressBar>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffdddddd)),
                         new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(0xffbee6fd)),
                     },

src/Perspex.Themes.Default/RadioButtonStyle.cs

@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty,  new ControlTemplate<RadioButton>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty,  new FuncControlTemplate<RadioButton>(Template)),
                     },
                 },
                 new Style(x => x.OfType<RadioButton>().Template().Name("checkMark"))

src/Perspex.Themes.Default/ScrollBarStyle.cs

@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ScrollBar>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ScrollBar>(Template)),
                     },
                 },
                 new Style(x => x.OfType<ScrollBar>().PropertyEquals(ScrollBar.OrientationProperty, Orientation.Horizontal))
@@ -83,7 +83,7 @@ namespace Perspex.Themes.Default
                     Thumb = new Thumb
                     {
                         Name = "thumb",
-                        Template = new ControlTemplate<Thumb>(ThumbTemplate),
+                        Template = new FuncControlTemplate<Thumb>(ThumbTemplate),
                     },
                 },
             };

src/Perspex.Themes.Default/ScrollViewerStyle.cs

@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ScrollViewer>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ScrollViewer>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/TabControlStyle.cs

@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabControl>(Template)),
                     },
                 },
             });

src/Perspex.Themes.Default/TabItemStyle.cs

@@ -29,7 +29,7 @@ namespace Perspex.Themes.Default
                     {
                         new Setter(TemplatedControl.FontSizeProperty, 16.0),
                         new Setter(TemplatedControl.ForegroundProperty, Brushes.Gray),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabItem>(Template)),
                     },
                 },
                 new Style(x => x.OfType<TabItem>().Class(":selected"))

src/Perspex.Themes.Default/TabStripStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabStrip>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabStrip>(Template)),
                     },
                 },
                 new Style(x => x.OfType<TabStrip>().Template().OfType<StackPanel>())

src/Perspex.Themes.Default/TextBoxStyle.cs

@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TextBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TextBox>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, Brushes.White),
                         new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xff707070)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),

src/Perspex.Themes.Default/ToggleButtonStyle.cs

@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToggleButton>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToggleButton>(Template)),
 						new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffaaaaaa)),
 						new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xffaaaaaa)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),

src/Perspex.Themes.Default/ToolTipStyle.cs

@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToolTip>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToolTip>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffffffe1)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Gray),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),

src/Perspex.Themes.Default/TreeViewItemStyle.cs

@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TreeViewItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TreeViewItem>(Template)),
                         new Setter(Control.FocusAdornerProperty, null),
                     },
                 },
@@ -61,7 +61,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToggleButton>(ToggleButtonTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToggleButton>(ToggleButtonTemplate)),
                     },
                 },
                 new Style(x => x.OfType<TreeViewItem>().Template().OfType<ToggleButton>().Class("expander").Class(":checked").Template().OfType<Path>())

src/Perspex.Themes.Default/TreeViewStyle.cs

@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TreeView>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TreeView>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Black),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                     },

src/Perspex.Themes.Default/WindowStyle.cs

@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Window>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Window>(Template)),
                         new Setter(TemplatedControl.FontFamilyProperty, "Segoe UI"),
                         new Setter(TemplatedControl.FontSizeProperty, 12.0),
                     },

tests/Perspex.Controls.UnitTests/CarouselTests.cs

@@ -17,7 +17,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new Carousel
             {
-                Template = new ControlTemplate<Carousel>(CreateTemplate),
+                Template = new FuncControlTemplate<Carousel>(CreateTemplate),
                 Items = new[]
                 {
                     "Foo",
@@ -36,7 +36,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new Carousel
             {
-                Template = new ControlTemplate<Carousel>(CreateTemplate),
+                Template = new FuncControlTemplate<Carousel>(CreateTemplate),
                 Items = new[]
                 {
                     "Foo",

tests/Perspex.Controls.UnitTests/ContentControlTests.cs

@@ -286,9 +286,9 @@ namespace Perspex.Controls.UnitTests
             Assert.Null(target.Presenter.Child.DataContext);
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<ContentControl>(parent =>
+            return new FuncControlTemplate<ContentControl>(parent =>
             {
                 return new Border
                 {

tests/Perspex.Controls.UnitTests/DropDownTests.cs

@@ -28,9 +28,9 @@ namespace Perspex.Controls.UnitTests
             Assert.Equal(new[] { "contentControl", "toggle", "popup" }, childIds);
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<DropDown>(parent =>
+            return new FuncControlTemplate<DropDown>(parent =>
             {
                 return new Panel
                 {

tests/Perspex.Controls.UnitTests/ItemsControlTests.cs

@@ -352,9 +352,9 @@ namespace Perspex.Controls.UnitTests
             public string Value { get; }
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<ItemsControl>(parent =>
+            return new FuncControlTemplate<ItemsControl>(parent =>
             {
                 return new Border
                 {

tests/Perspex.Controls.UnitTests/ListBoxTests.cs

@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -45,7 +45,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -71,7 +71,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -94,7 +94,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs

@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -38,7 +38,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -58,7 +58,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -78,7 +78,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -99,7 +99,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
             };
@@ -120,7 +120,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Toggle,
             };
@@ -142,7 +142,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
             };
@@ -164,7 +164,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
             };
@@ -186,7 +186,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -202,7 +202,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs

@@ -209,7 +209,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                     Child = target = new PopupContentControl
                     {
                         Content = new Border(),
-                        Template = new ControlTemplate<PopupContentControl>(PopupContentControlTemplate),
+                        Template = new FuncControlTemplate<PopupContentControl>(PopupContentControlTemplate),
                     }
                 };
 
@@ -255,7 +255,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<PopupRoot>(PopupRootTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<PopupRoot>(PopupRootTemplate)),
                     }
                 },
             };

tests/Perspex.Controls.UnitTests/Primitives/ScrollBarTests.cs

@@ -16,7 +16,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -31,7 +31,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -124,7 +124,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                     [!Track.OrientationProperty] = control[!ScrollBar.OrientationProperty],
                     Thumb = new Thumb
                     {
-                        Template = new ControlTemplate<Thumb>(ThumbTemplate),
+                        Template = new FuncControlTemplate<Thumb>(ThumbTemplate),
                     },
                 },
             };

tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

@@ -420,9 +420,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Equal(target.SelectedItem, items[1]);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs

@@ -82,9 +82,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Null(target.SelectedItem);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

@@ -429,9 +429,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Equal(new[] { "bar" }, vm.SelectedItems);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/Primitives/TabStripTests.cs

@@ -17,7 +17,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -43,7 +43,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -68,7 +68,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -109,7 +109,7 @@ namespace Perspex.Controls.UnitTests.Primitives
 
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = list
             };
 

tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs

@@ -21,7 +21,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator
+                Template = new FuncControlTemplate(_ => new Decorator
                 {
                     Child = new Panel
                     {
@@ -55,7 +55,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator
+                Template = new FuncControlTemplate(_ => new Decorator
                 {
                     Child = new Panel
                     {
@@ -84,7 +84,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator())
+                Template = new FuncControlTemplate(_ => new Decorator())
             };
 
             target.ApplyTemplate();
@@ -100,7 +100,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new ApplyTemplateTracker())
+                Template = new FuncControlTemplate(_ => new ApplyTemplateTracker())
             };
 
             target.ApplyTemplate();
@@ -121,7 +121,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ItemsControl
             {
-                Template = new ControlTemplate<ItemsControl>(ItemsControlTemplate),
+                Template = new FuncControlTemplate<ItemsControl>(ItemsControlTemplate),
                 Items = new[] { "Foo", }
             };
 
@@ -169,7 +169,7 @@ namespace Perspex.Controls.UnitTests.Primitives
             {
                 Child = new ScrollViewer
                 {
-                    Template = new ControlTemplate<ScrollViewer>(ScrollViewerTemplate),
+                    Template = new FuncControlTemplate<ScrollViewer>(ScrollViewerTemplate),
                     Content = new ItemsPresenter
                     {
                         Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs

@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ScrollViewer
             {
-                Template = new ControlTemplate<ScrollViewer>(CreateTemplate),
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
                 Content = "Foo",
             };
 
@@ -34,7 +34,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ContentControl
             {
-                Template = new ControlTemplate<ContentControl>(CreateNestedTemplate),
+                Template = new FuncControlTemplate<ContentControl>(CreateNestedTemplate),
                 Content = "Foo",
             };
 
@@ -100,7 +100,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate<ScrollViewer>(CreateTemplate),
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
                 Content = new ContentPresenter
                 {
                     Name = "this"

tests/Perspex.Controls.UnitTests/TabControlTests.cs

@@ -19,7 +19,7 @@ namespace Perspex.Controls.UnitTests
             TabItem selected;
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     (selected = new TabItem
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -73,7 +73,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -117,7 +117,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = collection,
             };
 
@@ -144,7 +144,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -184,14 +184,14 @@ namespace Perspex.Controls.UnitTests
                     new TabStrip
                     {
                         Name = "tabStrip",
-                        Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                        Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                         [!ItemsControl.ItemsProperty] = parent[!ItemsControl.ItemsProperty],
                         [!!TabStrip.SelectedTabProperty] = parent[!!TabControl.SelectedTabProperty]
                     },
                     new Carousel
                     {
                         Name = "carousel",
-                        Template = new ControlTemplate<Carousel>(CreateCarouselTemplate),
+                        Template = new FuncControlTemplate<Carousel>(CreateCarouselTemplate),
                         MemberSelector = parent.ContentSelector,
                         [!ItemsControl.ItemsProperty] = parent[!ItemsControl.ItemsProperty],
                         [!SelectingItemsControl.SelectedItemProperty] = parent[!SelectingItemsControl.SelectedItemProperty],

tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs

@@ -20,7 +20,7 @@ namespace Perspex.Controls.UnitTests
         {
             bool executed = false;
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 executed = true;
                 return new Control();
@@ -39,7 +39,7 @@ namespace Perspex.Controls.UnitTests
         {
             bool executed = false;
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 executed = true;
                 return new Control();
@@ -60,7 +60,7 @@ namespace Perspex.Controls.UnitTests
         {
             Control templateResult = new Control();
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 return templateResult;
             });
@@ -81,7 +81,7 @@ namespace Perspex.Controls.UnitTests
         {
             Control templateResult = new Control();
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 return templateResult;
             });
@@ -101,7 +101,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new Control();
                 })
@@ -117,7 +117,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new StackPanel
                     {
@@ -154,7 +154,7 @@ namespace Perspex.Controls.UnitTests
                 {
                     Child = target = new TestTemplatedControl
                     {
-                        Template = new ControlTemplate(_ =>
+                        Template = new FuncControlTemplate(_ =>
                         {
                             return new StackPanel
                             {
@@ -182,7 +182,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new StackPanel
                     {
@@ -210,7 +210,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new ContentPresenter
                     {
@@ -235,11 +235,11 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new ContentControl
                     {
-                        Template = new ControlTemplate(parent =>
+                        Template = new FuncControlTemplate(parent =>
                         {
                             return new Border
                             {

tests/Perspex.Controls.UnitTests/TopLevelTests.cs

@@ -316,9 +316,9 @@ namespace Perspex.Controls.UnitTests
             }
         }
 
-        private ControlTemplate<TestTopLevel> CreateTemplate()
+        private FuncControlTemplate<TestTopLevel> CreateTemplate()
         {
-            return new ControlTemplate<TestTopLevel>(x =>
+            return new FuncControlTemplate<TestTopLevel>(x =>
                 new ContentPresenter
                 {
                     [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],

tests/Perspex.Controls.UnitTests/TreeViewTests.cs

@@ -19,7 +19,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TreeView
             {
-                Template = new ControlTemplate(CreateTreeViewTemplate),
+                Template = new FuncControlTemplate(CreateTreeViewTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TreeView
             {
-                Template = new ControlTemplate(CreateTreeViewTemplate),
+                Template = new FuncControlTemplate(CreateTreeViewTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -71,7 +71,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",

tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs

@@ -59,9 +59,9 @@ namespace Perspex.Controls.UnitTests.Utils
             }
         }
 
-        private ControlTemplate CreateWindowTemplate()
+        private FuncControlTemplate CreateWindowTemplate()
         {
-            return new ControlTemplate<Window>(parent =>
+            return new FuncControlTemplate<Window>(parent =>
             {
                 return new ContentPresenter
                 {

tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs

@@ -16,7 +16,7 @@ namespace Perspex.Styling.UnitTests
         [Fact]
         public void Template_Child_Of_Control_With_Two_Classes()
         {
-            var template = new ControlTemplate(parent =>
+            var template = new FuncControlTemplate(parent =>
             {
                 return new Border
                 {