Skip to content

Commit f673046

Browse files
Revert "Fix FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar" (#28189)
* reverted 25857 changes * added comments
1 parent abe9a73 commit f673046

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ public static void UpdateBackButton(this MauiToolbar platformToolbar, Toolbar to
3535
platformToolbar.IsBackEnabled =
3636
toolbar.BackButtonEnabled && toolbar.BackButtonVisible;
3737

38-
// Adjusts WinUI TogglePaneButton visibility based on DrawerToggleVisible setting.
39-
if (platformToolbar.TogglePaneButton is not null)
40-
platformToolbar.TogglePaneButton.Visibility = toolbar.DrawerToggleVisible ? UI.Xaml.Visibility.Visible : UI.Xaml.Visibility.Collapsed;
41-
4238
platformToolbar
4339
.IsBackButtonVisible = (toolbar.BackButtonVisible) ? NavigationViewBackButtonVisible.Visible : NavigationViewBackButtonVisible.Collapsed;
4440

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using NUnit.Framework;
1+
#if TEST_FAILS_ON_WINDOWS // Fix reverted. Refer For further info - https://github.com/dotnet/maui/issues/24547
2+
using NUnit.Framework;
23
using UITest.Appium;
34
using UITest.Core;
45

@@ -16,4 +17,5 @@ public void VerifyInitialToolbarButtonHidden()
1617
App.WaitForElement("DetailButton");
1718
VerifyScreenshot();
1819
}
19-
}
20+
}
21+
#endif

0 commit comments

Comments
 (0)