Skip to content

Conversation

@NirmalKumarYuvaraj
Copy link
Contributor

@NirmalKumarYuvaraj NirmalKumarYuvaraj commented Mar 5, 2025

This PR reverts the changes made in PR #25857.

Fixes #28130

@dotnet-policy-service dotnet-policy-service bot added community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration labels Mar 5, 2025
@NirmalKumarYuvaraj NirmalKumarYuvaraj marked this pull request as ready for review March 5, 2025 14:14
Copilot AI review requested due to automatic review settings March 5, 2025 14:14
@NirmalKumarYuvaraj NirmalKumarYuvaraj requested a review from a team as a code owner March 5, 2025 14:14
Copy link
Contributor

Copilot AI left a 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)

@jfversluis jfversluis added this to the .NET 9 SR5 milestone Mar 5, 2025
@jfversluis jfversluis requested a review from PureWeen March 5, 2025 14:49
@jfversluis jfversluis added the p/0 Current heighest priority issues that we are targeting for a release. label Mar 5, 2025
@PureWeen PureWeen moved this from Todo to Ready To Review in MAUI SDK Ongoing Mar 5, 2025
@PureWeen
Copy link
Member

PureWeen commented Mar 5, 2025

/azp run

@github-project-automation github-project-automation bot moved this from Ready To Review to Approved in MAUI SDK Ongoing Mar 5, 2025
@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@PureWeen PureWeen merged commit f673046 into dotnet:main Mar 6, 2025
126 of 128 checks passed
@github-project-automation github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing Mar 6, 2025
@PureWeen
Copy link
Member

PureWeen commented Mar 6, 2025

/backport to release/9.0.1xx-sr4

@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2025

Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/13702310901

@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2025

@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 128

Please backport manually!

PureWeen pushed a commit that referenced this pull request Mar 6, 2025
…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
bhavanesh2001 pushed a commit to bhavanesh2001/maui that referenced this pull request Mar 7, 2025
…urn false, still shows button in title bar" (dotnet#28189)

* reverted 25857 changes

* added comments
rmarinho pushed a commit that referenced this pull request Mar 11, 2025
…urn false, still shows button in title bar" (#28189)

* reverted 25857 changes

* added comments
PureWeen added a commit that referenced this pull request Mar 12, 2025
…urn false, still shows button in title bar" (#28189) (#28232)

* reverted 25857 changes

* added comments
# Conflicts:
#	src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs

Co-authored-by: NirmalKumarYuvaraj <97871636+NirmalKumarYuvaraj@users.noreply.github.com>
@github-actions github-actions bot locked and limited conversation to collaborators Apr 6, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

community ✨ Community Contribution p/0 Current heighest priority issues that we are targeting for a release. partner/syncfusion Issues / PR's with Syncfusion collaboration

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

[9.0 SR4 Windows] Flyout Menu Icon disappears from Window Title Bar after Navigation

4 participants