Don't set the width of the TitleView to the width of the status bar

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellTitleView.cs

@@ -21,12 +21,69 @@ namespace Xamarin.Forms.Controls.Issues
 	public class ShellTitleView : TestShell
 	{
 		protected override void Init()
+		{
+			SetupMeasuringTest1();
+			SetupMeasuringTest2();
+			SetupMeasuringTest3();
+		}
+
+		void SetupMeasuringTest3()
+		{
+			ContentPage contentPage = new ContentPage();
+			AddFlyoutItem(contentPage, "Width Measure and ToolBarItem (13949)");
+
+			Grid grid = new Grid();
+			grid.ColumnDefinitions.Add(new ColumnDefinition());
+			grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
+			grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
+			grid.AddChild(new Label() { Text = "Text" }, 0, 0);
+			grid.AddChild(new Button() { Text = "B1" }, 1, 0);
+			grid.AddChild(new Button() { Text = "B2" }, 2, 0);
+
+			Shell.SetTitleView(contentPage, grid);
+
+			contentPage.Content = new StackLayout()
+			{
+				Children =
+				{
+					new Label() { Text = "TitleView should have one label and two buttons"}
+				}
+			};
+
+			contentPage.ToolbarItems.Add(new ToolbarItem() { Text = "Item" });
+		}
+
+		void SetupMeasuringTest2()
+		{
+			ContentPage contentPage = new ContentPage();
+			AddFlyoutItem(contentPage, "Width Measure (13949)");
+
+			Grid grid = new Grid();
+			grid.ColumnDefinitions.Add(new ColumnDefinition());
+			grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
+			grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
+			grid.AddChild(new Label() { Text = "Text" }, 0, 0);
+			grid.AddChild(new Button() { Text = "B1" }, 1, 0);
+			grid.AddChild(new Button() { Text = "B2" }, 2, 0);
+
+			Shell.SetTitleView(contentPage, grid);
+
+			contentPage.Content = new StackLayout()
+			{
+				Children =
+				{
+					new Label() { Text = "TitleView should have one label and two buttons"}
+				}
+			};
+		}
+
+		void SetupMeasuringTest1()
 		{
 			AddTopTab(createContentPage("title 1"), "page 1");
 			AddTopTab(createContentPage(null), "page 2");
 			AddTopTab(createContentPage("title 3"), "page 3");
 			AddTopTab(createContentPage("title 4"), "page 4");
-
+			Items[0].Title = "Duplicate Test";
 			ContentPage createContentPage(string titleView)
 			{
 				Label safeArea = new Label();
@@ -38,7 +95,7 @@ ContentPage createContentPage(string titleView)
 						{
 							new Label()
 							{
-								Text = "Tab 1,3, and 4 should have a single visible TitleView. If the TitleView is duplicated or not visible the test has failed.",
+								Text = "Tab 1, 3, and 4 should have a single visible TitleView. If the TitleView is duplicated or not visible the test has failed.",
 								AutomationId = "Instructions"
 							},
 							safeArea
@@ -60,11 +117,29 @@ ContentPage createContentPage(string titleView)
 
 				return page;
 			}
-		}
 
+		}
 
 #if UITEST
 
+		[Test]
+		public void TitleWidthMeasuresCorrectly_13949()
+		{
+			this.TapInFlyout("Width Measure (13949)");
+			RunningApp.WaitForElement("Text");
+			RunningApp.WaitForElement("B1");
+			RunningApp.WaitForElement("B2");
+		}
+
+		[Test]
+		public void TitleWidthWithToolBarItemMeasuresCorrectly_13949()
+		{
+			this.TapInFlyout("Width Measure and ToolBarItem (13949)");
+			RunningApp.WaitForElement("Text");
+			RunningApp.WaitForElement("B1");
+			RunningApp.WaitForElement("B2");
+		}
+
 		[Test]
 		public void TitleViewPositionsCorrectly()
 		{

Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs

@@ -195,17 +195,6 @@ protected virtual void UpdateTitleView()
 			else
 			{
 				var view = new TitleViewContainer(titleView);
-
-				if (Forms.IsiOS11OrNewer)
-				{
-					view.TranslatesAutoresizingMaskIntoConstraints = false;
-				}
-				else
-				{
-					view.TranslatesAutoresizingMaskIntoConstraints = true;
-					view.AutoresizingMask = UIViewAutoresizing.FlexibleHeight | UIViewAutoresizing.FlexibleWidth;
-				}
-
 				NavigationItem.TitleView = view;
 			}
 		}
@@ -399,6 +388,16 @@ public class TitleViewContainer : UIContainerView
 			public TitleViewContainer(View view) : base(view)
 			{
 				MatchHeight = true;
+
+				if (Forms.IsiOS11OrNewer)
+				{
+					TranslatesAutoresizingMaskIntoConstraints = false;
+				}
+				else
+				{
+					TranslatesAutoresizingMaskIntoConstraints = true;
+					AutoresizingMask = UIViewAutoresizing.FlexibleHeight | UIViewAutoresizing.FlexibleWidth;
+				}
 			}
 
 			public override CGRect Frame
@@ -424,7 +423,6 @@ public override void WillMoveToSuperview(UIView newSuper)
 						Frame = new CGRect(Frame.X, newSuper.Bounds.Y, Frame.Width, newSuper.Bounds.Height);
 
 					Height = newSuper.Bounds.Height;
-					Width = newSuper.Bounds.Width;
 				}
 
 				base.WillMoveToSuperview(newSuper);