Skip to content

Revert "Fix FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar" #28189

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

Merged
merged 2 commits into from
Mar 6, 2025
Merged

Revert "Fix FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar" #28189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc723d
reverted 25857 changes
NirmalKumarYuvaraj Mar 5, 2025
d2d1004
added comments
NirmalKumarYuvaraj Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ public static void UpdateBackButton(this MauiToolbar platformToolbar, Toolbar to
platformToolbar.IsBackEnabled =
toolbar.BackButtonEnabled && toolbar.BackButtonVisible;

// Adjusts WinUI TogglePaneButton visibility based on DrawerToggleVisible setting.
if (platformToolbar.TogglePaneButton is not null)
platformToolbar.TogglePaneButton.Visibility = toolbar.DrawerToggleVisible ? UI.Xaml.Visibility.Visible : UI.Xaml.Visibility.Collapsed;

platformToolbar
.IsBackButtonVisible = (toolbar.BackButtonVisible) ? NavigationViewBackButtonVisible.Visible : NavigationViewBackButtonVisible.Collapsed;

Expand Down
6 changes: 4 additions & 2 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NUnit.Framework;
#if TEST_FAILS_ON_WINDOWS // Fix reverted. Refer For further info - https://github.com/dotnet/maui/issues/24547
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

Expand All @@ -16,4 +17,5 @@ public void VerifyInitialToolbarButtonHidden()
App.WaitForElement("DetailButton");
VerifyScreenshot();
}
}
}
#endif
Loading