Fix: Fixed issue where toolbar button sometimes had the wrong icon state #17032
Conversation
This file contains 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
Lamparter
reviewed
Apr 9, 2025
Comment on lines
+79
to
+96
| public bool HasAdditionalAction => | ||
| InstanceViewModel.IsPageTypeRecycleBin || | ||
| Commands.RunWithPowershell.IsExecutable || | ||
| CanExtract || | ||
| Commands.DecompressArchive.IsExecutable || | ||
| Commands.DecompressArchiveHere.IsExecutable || | ||
| Commands.DecompressArchiveHereSmart.IsExecutable || | ||
| Commands.DecompressArchiveToChildFolder.IsExecutable || | ||
| Commands.EditInNotepad.IsExecutable || | ||
| Commands.RotateLeft.IsExecutable || | ||
| Commands.RotateRight.IsExecutable || | ||
| Commands.SetAsAppBackground.IsExecutable || | ||
| Commands.SetAsWallpaperBackground.IsExecutable || | ||
| Commands.SetAsLockscreenBackground.IsExecutable || | ||
| Commands.SetAsSlideshowBackground.IsExecutable || | ||
| Commands.InstallFont.IsExecutable || | ||
| Commands.InstallInfDriver.IsExecutable || | ||
| Commands.InstallCertificate.IsExecutable; |
There was a problem hiding this comment.
Suggested change
| public bool HasAdditionalAction => | |
| InstanceViewModel.IsPageTypeRecycleBin || | |
| Commands.RunWithPowershell.IsExecutable || | |
| CanExtract || | |
| Commands.DecompressArchive.IsExecutable || | |
| Commands.DecompressArchiveHere.IsExecutable || | |
| Commands.DecompressArchiveHereSmart.IsExecutable || | |
| Commands.DecompressArchiveToChildFolder.IsExecutable || | |
| Commands.EditInNotepad.IsExecutable || | |
| Commands.RotateLeft.IsExecutable || | |
| Commands.RotateRight.IsExecutable || | |
| Commands.SetAsAppBackground.IsExecutable || | |
| Commands.SetAsWallpaperBackground.IsExecutable || | |
| Commands.SetAsLockscreenBackground.IsExecutable || | |
| Commands.SetAsSlideshowBackground.IsExecutable || | |
| Commands.InstallFont.IsExecutable || | |
| Commands.InstallInfDriver.IsExecutable || | |
| Commands.InstallCertificate.IsExecutable; | |
| public bool HasAdditionalAction => | |
| InstanceViewModel.IsPageTypeRecycleBin || | |
| Commands.RunWithPowershell.IsExecutable || | |
| CanExtract || | |
| Commands.DecompressArchive.IsExecutable || | |
| Commands.DecompressArchiveHere.IsExecutable || | |
| Commands.DecompressArchiveHereSmart.IsExecutable || | |
| Commands.DecompressArchiveToChildFolder.IsExecutable || | |
| Commands.EditInNotepad.IsExecutable || | |
| Commands.RotateLeft.IsExecutable || | |
| Commands.RotateRight.IsExecutable || | |
| Commands.SetAsAppBackground.IsExecutable || | |
| Commands.SetAsWallpaperBackground.IsExecutable || | |
| Commands.SetAsLockscreenBackground.IsExecutable || | |
| Commands.SetAsSlideshowBackground.IsExecutable || | |
| Commands.InstallFont.IsExecutable || | |
| Commands.InstallInfDriver.IsExecutable || | |
| Commands.InstallCertificate.IsExecutable; |
This might look prettier, since the above is similar to other large statements in the codebase.
There was a problem hiding this comment.
I'd rather stick with the current formatting.
Lamparter
approved these changes
Apr 9, 2025
0x5bfa
reviewed
Apr 9, 2025
Comment on lines
+26
to
+29
| context.PageType != ContentPageTypes.RecycleBin && | ||
| context.PageType != ContentPageTypes.ZipFolder && | ||
| context.PageType != ContentPageTypes.ReleaseNotes && | ||
| context.PageType != ContentPageTypes.Settings && |
There was a problem hiding this comment.
If you're interested, you can use is, and, or:
Suggested change
| context.PageType != ContentPageTypes.RecycleBin && | |
| context.PageType != ContentPageTypes.ZipFolder && | |
| context.PageType != ContentPageTypes.ReleaseNotes && | |
| context.PageType != ContentPageTypes.Settings && | |
| context.PageType is not ContentPageTypes.RecycleBin and | |
| not ContentPageTypes.ZipFolder and | |
| not ContentPageTypes.ReleaseNotes and | |
| not ContentPageTypes.Settings && |
There was a problem hiding this comment.
They have the same results here so I would just leave it as is.
Comment on lines
-57
to
-62
| if (context.ShellPage is not null && context.ShellPage.SlimContentPage is not null) | ||
| { | ||
| var viewModel = context.ShellPage.SlimContentPage.SelectedItemsPropertiesViewModel; | ||
| var extensions = context.SelectedItems.Select(selectedItem => selectedItem.FileExtension).Distinct().ToList(); | ||
|
|
||
| viewModel.CheckAllFileExtensions(extensions); |
There was a problem hiding this comment.
The logic was moved to IsExecutable.
0x5bfa
approved these changes
Apr 9, 2025
|
@jpozo20 thank you for helping fix this issue! |
yaira2
added
ready to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolved / Related Issues
To prevent extra work, all changes to the Files codebase must link to an approved issue marked as
Ready to build. Please insert the issue number following the hashtag with the issue number that this Pull Request resolves.Steps used to test these changes
Stability is a top priority for Files and all changes are required to go through testing before being merged into the repo. Please include a list of steps that you used to test this PR.
Comments
The issue only occurs for files with additional actions in the toolbar. I discovered that changing from
x:LoadtoVisibilityresolves the issue. However, this introduces a different issue where the overflow button sometimes displays when there were no overflow items. TogglingIsDynamicOverflowEnabledseems to workaround this issue.