Conversation
PureWeen
added
the
backport/suggested
Member
Author
|
This PR might have some dependencies on #12888 |
PureWeen
commented
Apr 17, 2023
|
|
||
| if (item.Order != ToolbarItemOrder.Secondary) | ||
| menuitem.SetShowAsAction(ShowAsAction.Always); | ||
| else |
Member
Author
There was a problem hiding this comment.
This is the only functional change. Never is the default so we are just reverting this back to the default if the user hasn't indicated Primary
Contributor
|
Thank you for your pull request. We are auto-formatting your source code to follow our code guidelines. |
mattleibow
approved these changes
Apr 26, 2023
hartez
added
the
backport/approved
Contributor
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/5138896008 |
Contributor
|
@hartez backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Set menuItem show action back to Never
.git/rebase-apply/patch:38: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
M src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs
M src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs
M src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
CONFLICT (content): Merge conflict in src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.cs
Auto-merging src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Windows.cs
Auto-merging src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs
Auto-merging src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Set menuItem show action back to Never
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@hartez an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
hartez
added a commit
that referenced
this pull request
Jun 2, 2023
* Set menuItem show action back to Never * Auto-format source code * - fix iOS handler registration --------- Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
PureWeen
added a commit
that referenced
this pull request
Jun 5, 2023
* Set menuItem show action back to Never (#14623) * Set menuItem show action back to Never * Auto-format source code * - fix iOS handler registration --------- Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com> * - backport testing helpers * - fix up tests --------- Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com> Co-authored-by: Shane Neuville <shane94@hotmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
samhouts
added
the
fixed-in-8.0.0-preview.4.8333
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
Prior to MAUI whenever the
ToolbarItemschanged we'd remove and readd all of them. This caused an awkward reshuffling effect with MAUI and theMaterialToolbar. So, we need to add code to switchMenuItemsback toPrimarywhen navigating.Issues Fixed
Fixes #14617