diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs index 6e9d345e2650..45cc3f006c00 100644 --- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs +++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs @@ -10,6 +10,6 @@ public partial class Issue17789 : ContentPage public Issue17789() { InitializeComponent(); - } + } } } \ No newline at end of file diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs index 107646d21960..b69a81a6d1e9 100644 --- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs +++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs @@ -548,7 +548,7 @@ void OnWindowChanged(object sender, EventArgs e) { w.Toolbar = null; } - + var flyoutPage = _toolbar.FindParentOfType(); if (flyoutPage != null && flyoutPage.Parent is IWindow) { diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs index 91f35a3af6a4..e26eca049fe8 100644 --- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs +++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs @@ -45,15 +45,15 @@ public async Task BackButtonEnabledChangesWithPushPopAndPageChanges() var flyoutPage = new FlyoutPage(); flyoutPage.Title = "Hello world"; - flyoutPage.FlyoutLayoutBehavior = FlyoutLayoutBehavior.Split; + flyoutPage.FlyoutLayoutBehavior = FlyoutLayoutBehavior.Split; flyoutPage.Flyout = new ContentPage() { Title = "Hello world" }; var first = new NavigationPage(new ContentPage()); var second = new NavigationPage(new ContentPage()); - flyoutPage.Detail = first; + flyoutPage.Detail = first; - await CreateHandlerAndAddToWindow(flyoutPage, async (handler) => + await CreateHandlerAndAddToWindow(flyoutPage, async (handler) => { var navView = (RootNavigationView)GetMauiNavigationView(handler.MauiContext); Assert.False(navView.IsBackEnabled); diff --git a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs index 3aa5cc9479d6..ee28a02795a7 100644 --- a/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs @@ -31,8 +31,8 @@ void SetupBuilder() handlers.AddHandler(typeof(NavigationPage), typeof(NavigationViewHandler)); handlers.AddHandler(typeof(TabbedPage), typeof(TabbedViewHandler)); #endif - handlers.AddHandler(typeof(FlyoutPage), typeof(FlyoutViewHandler)); - handlers.AddHandler(); + handlers.AddHandler(typeof(FlyoutPage), typeof(FlyoutViewHandler)); + handlers.AddHandler(); handlers.AddHandler(); handlers.AddHandler(); handlers.AddHandler();