-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR Overview
This PR reverts the changes made in a previous PR (#25857), restoring behavior related to the FlyoutPage toolbar button on Windows as reported in issue #28130.
- Reverts conditional behavior in the Windows toolbar extensions
- Wraps a test in a platform-specific conditional compilation block
Reviewed Changes
| File | Description |
|---|---|
| src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs | Re-adds conditional compilation around a test case to align with the reverted behavior |
| src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs | Removes the logic that adjusted the TogglePaneButton’s visibility, reverting to previous behavior |
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
Comments suppressed due to low confidence (2)
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs:1
- [nitpick] Consider revising the comment text for clarity and consistency. For example, change 'Refer For further info' to 'See further info at'.
#if TEST_FAILS_ON_WINDOWS // Fix reverted. Refer For further info - https://github.com/dotnet/maui/issues/24547
src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs:35
- [nitpick] Ensure that automated tests in TestCases.HostApp and TestCases.Shared.Tests adequately cover the behavior of the TogglePaneButton visibility after this code reversion.
if (platformToolbar.TogglePaneButton is not null)
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/backport to release/9.0.1xx-sr4 |
|
Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/13702310901 |
|
@PureWeen backporting to "release/9.0.1xx-sr4" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: reverted 25857 changes
Using index info to reconstruct a base tree...
M src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs
CONFLICT (content): Merge conflict in src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 reverted 25857 changes
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
…urn false, still shows button in title bar" (#28189) * reverted 25857 changes * added comments # Conflicts: # src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs
…urn false, still shows button in title bar" (dotnet#28189) * reverted 25857 changes * added comments
…urn false, still shows button in title bar" (#28189) * reverted 25857 changes * added comments
This PR reverts the changes made in PR #25857.
Fixes #28130