From 7b9bf5f3f61a719f5e88952760a01b36d85dffac Mon Sep 17 00:00:00 2001
From: "E.Z. Hart" <hartez@gmail.com>
Date: Mon, 14 Mar 2022 22:55:39 -0600
Subject: [PATCH] Make TitleView work in NavigationPage on Windows

---
 .../Microsoft.Maui.Controls/NavigationPage.xml  |  9 ++++++++-
 src/Controls/src/Core/NavigationPageToolbar.cs  | 17 ++++++++++++++++-
 src/Core/src/Platform/Windows/MauiToolbar.xaml  |  3 ++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/Controls/docs/Microsoft.Maui.Controls/NavigationPage.xml b/src/Controls/docs/Microsoft.Maui.Controls/NavigationPage.xml
index 7c1019c2b690..bcd23a209612 100644
--- a/src/Controls/docs/Microsoft.Maui.Controls/NavigationPage.xml
+++ b/src/Controls/docs/Microsoft.Maui.Controls/NavigationPage.xml
@@ -1487,7 +1487,14 @@
       </ReturnValue>
       <Docs>
         <summary>Backing store for the attached property that gets and sets title views.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>On Windows, the TitleView will appear in the content area of the MauiToolbar control. By default, the content area's width is auto-sized to the content, with the remaining area made available for toolbar commands. This is to support the default Windows-specific dynamic overflow ability of the commands. If a user wants the TitleView to occupy all of the space not used by toolbar commands, dynamic overflow needs to be turned off, which can be accomplished by calling the Page's SetToolbarDynamicOverflowEnabled PlatformSpecific to false:
+		
+		<example>
+			<code>this.On&lt;WindowsOS&gt;().SetToolbarDynamicOverflowEnabled(false);</code>
+		</example>
+		
+		</remarks>
+		
       </Docs>
     </Member>
     <Member MemberName="Microsoft.Maui.Controls.INavigationPageController.RemoveAsyncInner">
diff --git a/src/Controls/src/Core/NavigationPageToolbar.cs b/src/Controls/src/Core/NavigationPageToolbar.cs
index b928dd828306..564682dbb427 100644
--- a/src/Controls/src/Core/NavigationPageToolbar.cs
+++ b/src/Controls/src/Core/NavigationPageToolbar.cs
@@ -158,6 +158,21 @@ void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEvent
 		Color GetBarTextColor() => _currentNavigationPage?.BarTextColor;
 		Color GetIconColor() => (_currentPage != null) ? NavigationPage.GetIconColor(_currentPage) : null;
 		string GetTitle() => _currentPage?.Title;
-		VisualElement GetTitleView() => (_currentNavigationPage != null) ? NavigationPage.GetTitleView(_currentNavigationPage) : null;
+		VisualElement GetTitleView()
+		{
+			if (_currentNavigationPage == null)
+			{
+				return null;
+			}
+
+			Page target = _currentNavigationPage;
+
+			if (_currentNavigationPage.CurrentPage is Page currentPage)
+			{
+				target = currentPage;
+			}
+
+			return NavigationPage.GetTitleView(target);
+		}
 	}
 }
diff --git a/src/Core/src/Platform/Windows/MauiToolbar.xaml b/src/Core/src/Platform/Windows/MauiToolbar.xaml
index 8f2b640d7cc7..daf083509ff9 100644
--- a/src/Core/src/Platform/Windows/MauiToolbar.xaml
+++ b/src/Core/src/Platform/Windows/MauiToolbar.xaml
@@ -31,7 +31,8 @@
                 <TextBlock VerticalAlignment="Center" x:Name="title" TextWrapping="NoWrap" Margin="10,0,0,0"/>
             </Border>
 
-            <ContentControl x:Name="titleView" Grid.Column="3" HorizontalAlignment="Stretch" />
+            <ContentControl x:Name="titleView" Grid.Column="3" HorizontalAlignment="Stretch" 
+                            HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
 
         </Grid>
     </CommandBar.Content>