Fix titlebar not being added to modal "windows" (#26735)

Co-authored-by: Mike Corsaro <[email protected]>
dotnet · Dec 23, 2024 · 7ea9ddf · 7ea9ddf
1 parent 8fd03b7
commit 7ea9ddf
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Windows.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Windows.cs
@@ -116,10 +116,21 @@ void SetCurrent(
 					}
 
 					var windowManager = modalContext.GetNavigationRootManager();
-					var platform = newPage.ToPlatform(modalContext);
-					_waitingForIncomingPage = platform.OnLoaded(() => completedCallback?.Invoke());
-					windowManager.Connect(platform);
-					Container.AddPage(windowManager.RootView);
+					if (windowManager is not null)
+					{
+						// Set the titlebar on the new navigation root
+						if (previousPage is not null &&
+							previousPage.GetParentWindow() is Window window &&
+							window.TitleBar is TitleBar titlebar)
+						{
+							windowManager.SetTitleBar(titlebar, modalContext);
+						}
+
+						var platform = newPage.ToPlatform(modalContext);
+						_waitingForIncomingPage = platform.OnLoaded(() => completedCallback?.Invoke());
+						windowManager.Connect(platform);
+						Container.AddPage(windowManager.RootView);
+					}
 				}
 				// popping modal
 				else
@@ -135,6 +146,14 @@ void SetCurrent(
 						wrv.SetTitleBarVisibility(UI.Xaml.Visibility.Visible);
 					}
 
+					// Restore the titlebar
+					if (previousPage is not null &&
+						previousPage.GetParentWindow() is Window window &&
+						window.TitleBar is TitleBar titlebar)
+					{
+						windowManager.SetTitleBar(titlebar, context);
+					}
+
 					var platform = newPage.ToPlatform();
 					_waitingForIncomingPage = platform.OnLoaded(() => completedCallback?.Invoke());
 					Container.AddPage(windowManager.RootView);

diff --git a/src/Core/src/Platform/Windows/WindowRootView.cs b/src/Core/src/Platform/Windows/WindowRootView.cs
@@ -444,6 +444,7 @@ internal void SetTitleBar(ITitleBar? titlebar, IMauiContext? mauiContext)
 
 			if (_titleBar is null || mauiContext is null)
 			{
+				UpdateBackgroundColorForButtons();
 				return;
 			}
 
@@ -506,10 +507,16 @@ private void TitlebarPropChanged_PropertyChanged(object? sender, PropertyChanged
 
 		private void UpdateBackgroundColorForButtons()
 		{
-			if (NavigationViewControl?.ButtonHolderGrid is not null &&
-				_titleBar?.Background is SolidPaint bg)
+			if (NavigationViewControl?.ButtonHolderGrid is not null)
 			{
-				NavigationViewControl.ButtonHolderGrid.Background = new SolidColorBrush(bg.Color.ToWindowsColor());
+				if (_titleBar?.Background is SolidPaint bg)
+				{
+					NavigationViewControl.ButtonHolderGrid.Background = new SolidColorBrush(bg.Color.ToWindowsColor());
+				}
+				else
+				{
+					NavigationViewControl.ButtonHolderGrid.Background = new SolidColorBrush(UI.Colors.Transparent);
+				}
 			}
 		}