Implement the basic WindowHandler

Microsoft.Maui-net6.sln

@@ -116,11 +116,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Profiling", "src\Controls\samples\Controls.Sample.Profiling\Maui.Controls.Sample.Profiling.csproj", "{75DB635C-0035-46E7-9A33-857D38082503}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8F075D72-B023-4B5A-AB5E-43CA38B6CE92}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D8CD878F-34BC-4393-881A-E3DD7348A13E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core.UnitTests-net6", "src\Controls\tests\Core.UnitTests\Controls.Core.UnitTests-net6.csproj", "{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Maps-net6", "src\Controls\Maps\src\Controls.Maps-net6.csproj", "{41CF73B5-D60E-4644-BA72-904CFF43C4AF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Maps-net6", "src\Controls\Maps\src\Controls.Maps-net6.csproj", "{09D4CF7F-7B0D-45FE-B017-561B2A981912}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core.UnitTests-net6", "src\Controls\tests\Core.UnitTests\Controls.Core.UnitTests-net6.csproj", "{DCA77B3F-73C2-488C-8D16-F5055DC3098C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Benchmarks-net6", "src\Core\tests\Benchmarks\Core.Benchmarks-net6.csproj", "{A1B1052C-740D-4733-BB3F-8558B661E78D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -287,14 +289,18 @@ Global
 		{75DB635C-0035-46E7-9A33-857D38082503}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75DB635C-0035-46E7-9A33-857D38082503}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75DB635C-0035-46E7-9A33-857D38082503}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09D4CF7F-7B0D-45FE-B017-561B2A981912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D4CF7F-7B0D-45FE-B017-561B2A981912}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09D4CF7F-7B0D-45FE-B017-561B2A981912}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09D4CF7F-7B0D-45FE-B017-561B2A981912}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41CF73B5-D60E-4644-BA72-904CFF43C4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41CF73B5-D60E-4644-BA72-904CFF43C4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41CF73B5-D60E-4644-BA72-904CFF43C4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41CF73B5-D60E-4644-BA72-904CFF43C4AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCA77B3F-73C2-488C-8D16-F5055DC3098C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCA77B3F-73C2-488C-8D16-F5055DC3098C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCA77B3F-73C2-488C-8D16-F5055DC3098C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCA77B3F-73C2-488C-8D16-F5055DC3098C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B1052C-740D-4733-BB3F-8558B661E78D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B1052C-740D-4733-BB3F-8558B661E78D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B1052C-740D-4733-BB3F-8558B661E78D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B1052C-740D-4733-BB3F-8558B661E78D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -345,9 +351,10 @@ Global
 		{081EE5E5-69D4-493C-9EB4-47423C4728AB} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{6EDE0C1B-B718-4331-99BA-423042CDBE24} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{75DB635C-0035-46E7-9A33-857D38082503} = {E1082E26-D700-4127-9329-66D673FD2D55}
-		{8F075D72-B023-4B5A-AB5E-43CA38B6CE92} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
-		{4FA0DFAE-1C4A-46BC-BC56-ABB12A0DAFBF} = {8F075D72-B023-4B5A-AB5E-43CA38B6CE92}
-		{09D4CF7F-7B0D-45FE-B017-561B2A981912} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{D8CD878F-34BC-4393-881A-E3DD7348A13E} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
+		{41CF73B5-D60E-4644-BA72-904CFF43C4AF} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{DCA77B3F-73C2-488C-8D16-F5055DC3098C} = {D8CD878F-34BC-4393-881A-E3DD7348A13E}
+		{A1B1052C-740D-4733-BB3F-8558B661E78D} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}

src/Compatibility/ControlGallery/src/Core/Startup.cs

@@ -10,7 +10,7 @@ public class Startup : IStartup
 	{
 		internal static bool UseBlazor = false;
 
-		public void Configure(IAppHostBuilder appBuilder)
+		public virtual void Configure(IAppHostBuilder appBuilder)
 		{
 			appBuilder
 				.UseMauiApp<App>()

src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs

@@ -1,89 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Windows.ApplicationModel;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.Foundation.Metadata;
-using Windows.UI;
-using Windows.UI.ViewManagement;
-
-// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
-
-namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
+namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
-	public class MiddleApp : MauiWinUIApplication<Startup>
-	{
-	}
-
-	/// <summary>
-	/// Provides application-specific behavior to supplement the default Application class.
-	/// </summary>
 	sealed partial class App : MiddleApp
 	{
-		public static bool RunningAsUITests { get; private set; }
-		/// <summary>
-		/// Initializes the singleton application object.  This is the first line of authored code
-		/// executed, and as such is the logical equivalent of main() or WinMain().
-		/// </summary>
+		public static bool RunningAsUITests { get; set; }
+
 		public App()
 		{
 			InitializeComponent();
-			//Suspending += OnSuspending;
-		}
-
-		public override MauiWinUIWindow CreateWindow()
-		{
-			return new MainPage();
-		}
-
-		/// <summary>
-		/// Invoked when the application is launched normally by the end user.  Other entry points
-		/// will be used such as when the application is launched to open a specific file.
-		/// </summary>
-		/// <param name="e">Details about the launch request and process.</param>
-		protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
-		{
-			base.OnLaunched(e);
-			if (!String.IsNullOrWhiteSpace(e.Arguments) &&
-				e.Arguments.Contains("RunningAsUITests"))
-			{
-				RunningAsUITests = true;
-				ControlGallery.App.PreloadTestCasesIssuesList = false;
-			}
-		}
-
-		/// <summary>
-		/// Invoked when Navigation to a certain page fails
-		/// </summary>
-		/// <param name="sender">The Frame which failed navigation</param>
-		/// <param name="e">Details about the navigation failure</param>
-		void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-		{
-			throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
 		}
+	}
 
-		/// <summary>
-		/// Invoked when application execution is being suspended.  Application state is saved
-		/// without knowing whether the application will be terminated or resumed with the contents
-		/// of memory still intact.
-		/// </summary>
-		/// <param name="sender">The source of the suspend request.</param>
-		/// <param name="e">Details about the suspend request.</param>
-		void OnSuspending(object sender, SuspendingEventArgs e)
-		{
-			var deferral = e.SuspendingOperation.GetDeferral();
-			//TODO: Save application state and stop any background activity
-			deferral.Complete();
-		}
+	public class MiddleApp : MauiWinUIApplication<WinUIStartup>
+	{
 	}
-}
+}

src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs → src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs

@@ -1,85 +1,79 @@
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-using System;
+using System;
 using System.Globalization;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Hosting;
+using Microsoft.Maui.LifecycleEvents;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Windows.Graphics.Display;
 using Windows.System;
-using Windows.UI.Core;
 using Windows.UI.ViewManagement;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
-	/// <summary>
-	/// An empty page that can be used on its own or navigated to within a Frame.
-	/// </summary>
-	public sealed partial class MainPage : MauiWinUIWindow
+	public class WinUIStartup : Startup
 	{
-		public MainPage()
+		public override void Configure(IAppHostBuilder appBuilder)
 		{
-			InitializeComponent();
-
-			// TODO WINUI3
-			// some tests need to window to be large enough to click on things
-			// can we make this only open to window size for UI Tests?
-			//var bounds = ApplicationView.GetForCurrentView().VisibleBounds;
-			//var scaleFactor = DisplayInformation.GetForCurrentView().RawPixelsPerViewPixel;
-			//var size = new Windows.Foundation.Size(bounds.Width * scaleFactor, bounds.Height * scaleFactor);
-			//ApplicationView.PreferredLaunchViewSize = size;
-			//ApplicationView.PreferredLaunchWindowingMode = ApplicationViewWindowingMode.PreferredLaunchViewSize;
-
+			base.Configure(appBuilder);
 
+			appBuilder.ConfigureLifecycleEvents(lifecycle => lifecycle
+				.AddWindows(windows => windows
+					.OnLaunching((_, e) =>
+					{
+						if (!string.IsNullOrWhiteSpace(e.Arguments) && e.Arguments.Contains("RunningAsUITests"))
+						{
+							App.RunningAsUITests = true;
+							ControlGallery.App.PreloadTestCasesIssuesList = false;
+						}
+					})
+					.OnActivated(WinUIPageStartup.OnActivated)));
+		}
+	}
 
+	static class WinUIPageStartup
+	{
+		public static void OnActivated(UI.Xaml.Window window, UI.Xaml.WindowActivatedEventArgs e)
+		{
 			// When the native control gallery loads up, it'll let us know so we can add the nested native controls
-			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(this, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
+			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(window, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
 
 			// When the native binding gallery loads up, it'll let us know so we can set up the native bindings
-			MessagingCenter.Subscribe<NativeBindingGalleryPage>(this, NativeBindingGalleryPage.ReadyForNativeBindingsMessage, AddNativeBindings);
+			MessagingCenter.Subscribe<NativeBindingGalleryPage>(window, NativeBindingGalleryPage.ReadyForNativeBindingsMessage, AddNativeBindings);
 
-			this.Activated += MainPage_Activated;
-		}
+			Application.Current.PropertyChanged += OnAppPropertyChanged;
 
-		private void MainPage_Activated(object sender, UI.Xaml.WindowActivatedEventArgs args)
-		{
-			Application.Current.PropertyChanged += _app_PropertyChanged;
-			WireUpKeyDown();
+			WireUpKeyDown(window);
+
+			void OnAppPropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e)
+			{
+				if (e.PropertyName == nameof(Application.MainPage))
+					WireUpKeyDown(window);
+			}
 		}
 
 		// TODO WINUI3 not sure the best way to detect the content swap out
-		void WireUpKeyDown()
+		static void WireUpKeyDown(UI.Xaml.Window window)
 		{
-			this.DispatcherQueue.TryEnqueue(() =>
+			window.DispatcherQueue.TryEnqueue(() =>
 			{
-				if (this.Content != null)
+				if (window.Content != null)
 				{
-					this.Content.KeyDown -= OnKeyDown;
-					this.Content.KeyDown += OnKeyDown;
+					window.Content.KeyDown -= OnKeyDown;
+					window.Content.KeyDown += OnKeyDown;
 				}
 				else
 				{
-					WireUpKeyDown();
+					WireUpKeyDown(window);
 				}
 			});
 		}
 
-		private void _app_PropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName == "MainPage")
-			{
-				WireUpKeyDown();
-			}
-		}
-
-		void OnKeyDown(object sender, KeyRoutedEventArgs args)
+		static void OnKeyDown(object sender, KeyRoutedEventArgs args)
 		{
 			if (args.Key == VirtualKey.Escape)
 			{
@@ -95,7 +89,7 @@ void OnKeyDown(object sender, KeyRoutedEventArgs args)
 			}
 		}
 
-		void AddNativeControls(NestedNativeControlGalleryPage page)
+		static void AddNativeControls(NestedNativeControlGalleryPage page)
 		{
 			if (page.NativeControlsAdded)
 			{
@@ -116,7 +110,7 @@ void AddNativeControls(NestedNativeControlGalleryPage page)
 			sl?.Children.Add(textBlock);
 
 			// Create and add a native Button 
-			var button = new Microsoft.UI.Xaml.Controls.Button { Content = "Toggle Font Size", Height = 80 };
+			var button = new UI.Xaml.Controls.Button { Content = "Toggle Font Size", Height = 80 };
 			button.Click += (sender, args) => { textBlock.FontSize = textBlock.FontSize == 14 ? 24 : 14; };
 
 			sl?.Children.Add(button.ToView());
@@ -138,9 +132,7 @@ void AddNativeControls(NestedNativeControlGalleryPage page)
 				arrangeOverrideDelegate: (renderer, finalSize) =>
 				{
 					if (finalSize.Width <= 0 || double.IsInfinity(finalSize.Width))
-					{
 						return null;
-					}
 
 					FrameworkElement frameworkElement = renderer.Control;
 
@@ -168,7 +160,7 @@ void AddNativeControls(NestedNativeControlGalleryPage page)
 			page.NativeControlsAdded = true;
 		}
 
-		void AddNativeBindings(NativeBindingGalleryPage page)
+		static void AddNativeBindings(NativeBindingGalleryPage page)
 		{
 			if (page.NativeControlsAdded)
 				return;
@@ -187,10 +179,10 @@ void AddNativeBindings(NativeBindingGalleryPage page)
 				FontFamily = new FontFamily("HelveticaNeue")
 			};
 
-			var btnColor = new Microsoft.UI.Xaml.Controls.Button { Content = "Toggle Label Color", Height = 80 };
+			var btnColor = new UI.Xaml.Controls.Button { Content = "Toggle Label Color", Height = 80 };
 			btnColor.Click += (sender, args) => txbLabel.Foreground = SolidColorBrush.Pink.ToBrush();
 
-			var btnTextBox = new Microsoft.UI.Xaml.Controls.Button { Content = "Change text textbox", Height = 80 };
+			var btnTextBox = new UI.Xaml.Controls.Button { Content = "Change text textbox", Height = 80 };
 			btnTextBox.Click += (sender, args) => txbBox.Text = "Hello 2 way native";
 
 			txbLabel.SetBinding("Text", new Binding("NativeLabel"));
@@ -214,15 +206,15 @@ class ColorToBrushNativeBindingConverter : IValueConverter
 			public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 			{
 				if (value is Color)
-					return new Microsoft.UI.Xaml.Media.SolidColorBrush(ToWindowsColor((Color)value));
+					return new UI.Xaml.Media.SolidColorBrush(ToWindowsColor((Color)value));
 
 				return null;
 			}
 
 			public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
 			{
-				if (value is Microsoft.UI.Xaml.Media.SolidColorBrush)
-					return ToColor(((Microsoft.UI.Xaml.Media.SolidColorBrush)value).Color);
+				if (value is UI.Xaml.Media.SolidColorBrush)
+					return ToColor(((UI.Xaml.Media.SolidColorBrush)value).Color);
 
 				return null;
 			}
@@ -237,4 +229,4 @@ public static Color ToColor(Windows.UI.Color color)
 			}
 		}
 	}
-}
+}

src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs

@@ -344,16 +344,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<NavigationPage>
 					_toolbarTracker.CollectionChanged += ToolbarTrackerOnCollectionChanged;
 				}
 
-				var parents = new List<Page>();
-				Page root = Element;
-				while (!Application.IsApplicationOrNull(root.RealParent))
-				{
-					root = (Page)root.RealParent;
-					parents.Add(root);
-				}
-
 				_toolbarTracker.Target = e.NewElement;
-				_toolbarTracker.AdditionalTargets = parents;
+				_toolbarTracker.AdditionalTargets = Element.GetParentPages();
 				UpdateMenu();
 
 				var navController = (INavigationPageController)e.NewElement;