Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[housekeeping] Automated PR to fix formatting errors #18472

Merged
merged 1 commit into from Nov 6, 2023
Merged

[housekeeping] Automated PR to fix formatting errors #18472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs
View file
Open in desktop
Expand Up @@ -10,6 +10,6 @@ public partial class Issue17789 : ContentPage
public Issue17789()
{
InitializeComponent();
}
}
}
}
2 changes: 1 addition & 1 deletion src/Controls/src/Core/NavigationPage/NavigationPage.cs
View file
Open in desktop
Expand Up @@ -548,7 +548,7 @@ void OnWindowChanged(object sender, EventArgs e)
{
w.Toolbar = null;
}

var flyoutPage = _toolbar.FindParentOfType<FlyoutPage>();
if (flyoutPage != null && flyoutPage.Parent is IWindow)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.Windows.cs
View file
Open in desktop
Expand Up @@ -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<FlyoutViewHandler>(flyoutPage, async (handler) =>
await CreateHandlerAndAddToWindow<FlyoutViewHandler>(flyoutPage, async (handler) =>
{
var navView = (RootNavigationView)GetMauiNavigationView(handler.MauiContext);
Assert.False(navView.IsBackEnabled);
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
View file
Open in desktop
Expand Up @@ -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<Page, PageHandler>();
handlers.AddHandler(typeof(FlyoutPage), typeof(FlyoutViewHandler));
handlers.AddHandler<Page, PageHandler>();
handlers.AddHandler<Window, WindowHandlerStub>();
handlers.AddHandler<Frame, FrameRenderer>();
handlers.AddHandler<Label, LabelHandler>();
Expand Down