feedback addressed

xamarin · May 14, 2018 · 708cb15 · 708cb15
1 parent cdbe16b
commit 708cb15
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/Xamarin.Forms.Core/ContentPage.cs b/Xamarin.Forms.Core/ContentPage.cs
@@ -1,7 +1,7 @@
 namespace Xamarin.Forms
 {
 	[ContentProperty("Content")]
-	public class ContentPage : TemplatedPage
+	public class ContentPage : TemplatedPage, IControlTemplatedWithContent
 	{
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentPage), null, propertyChanged: TemplateUtilities.OnContentChanged);
 

diff --git a/Xamarin.Forms.Core/ContentView.cs b/Xamarin.Forms.Core/ContentView.cs
@@ -1,7 +1,7 @@
 namespace Xamarin.Forms
 {
 	[ContentProperty("Content")]
-	public class ContentView : TemplatedView
+	public class ContentView : TemplatedView, IControlTemplatedWithContent
 	{
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentView), null, propertyChanged: TemplateUtilities.OnContentChanged);
 

diff --git a/Xamarin.Forms.Core/IControlTemplated.cs b/Xamarin.Forms.Core/IControlTemplated.cs
@@ -2,7 +2,7 @@
 
 namespace Xamarin.Forms
 {
-	internal interface IControlTemplated
+	public interface IControlTemplated
 	{
 		ControlTemplate ControlTemplate { get; set; }
 

diff --git a/Xamarin.Forms.Core/IControlTemplatedWithContent.cs b/Xamarin.Forms.Core/IControlTemplatedWithContent.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.Forms
+{
+	public interface IControlTemplatedWithContent : IControlTemplated
+	{
+		View Content { get; set; }
+	}
+}
diff --git a/Xamarin.Forms.Platform.WPF/FormsContentLoader.cs b/Xamarin.Forms.Platform.WPF/FormsContentLoader.cs
@@ -58,9 +58,9 @@ private object CreateOrResizeContent(FrameworkElement parent, VisualElement visu
 			visualElement.Layout(actualRect);
 
 			// ControlTemplate adds an additional layer through which to send sizing changes.
-			var contentPage = visualElement as ContentPage;
-			if (contentPage?.ControlTemplate != null)
-				contentPage.Content?.Layout(actualRect);
+			var control = visualElement as IControlTemplatedWithContent;
+			if (control?.ControlTemplate != null)
+				control.Content?.Layout(actualRect);
 
 			IPageController pageController = visualElement.RealParent as IPageController;
 			if (pageController != null)