mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 01:36:31 +02:00
CmdPal: Fix missing app context menu actions on the main page (#46293)
## Summary of the Pull Request This PR fixes missing _Pin to ..._ menu items on app search result. `MainListPage` reuses `AppListItem` instances from the All Apps page, but their context menus were being built with the main page provider context instead of the All Apps provider context. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #45848 - [x] Closes: #46285 <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
This commit is contained in:
@@ -4,6 +4,8 @@
|
||||
|
||||
using CommunityToolkit.Mvvm.Messaging;
|
||||
using ManagedCommon;
|
||||
using Microsoft.CmdPal.Ext.Apps;
|
||||
using Microsoft.CmdPal.Ext.Apps.Programs;
|
||||
using Microsoft.CmdPal.UI.ViewModels;
|
||||
using Microsoft.CmdPal.UI.ViewModels.Messages;
|
||||
using Microsoft.CmdPal.UI.ViewModels.Services;
|
||||
@@ -56,6 +58,17 @@ internal sealed partial class CommandPaletteContextMenuFactory : IContextMenuFac
|
||||
List<IContextItem> moreCommands = [];
|
||||
var itemId = commandItem.Command.Id;
|
||||
var providerContext = page.ProviderContext;
|
||||
|
||||
// AppListItems can be surfaced on the main page even though they still
|
||||
// belong to the All Apps provider.
|
||||
// MainListPage only returns our in-proc wrappers/items.
|
||||
if (providerContext.ProviderId != AllAppsCommandProvider.WellKnownId &&
|
||||
page is ListViewModel { IsMainPage: true } &&
|
||||
commandItem.Model.Unsafe is AppListItem)
|
||||
{
|
||||
providerContext = _topLevelCommandManager.LookupProvider(AllAppsCommandProvider.WellKnownId)?.GetProviderContext() ?? providerContext;
|
||||
}
|
||||
|
||||
var supportsPinning = providerContext.SupportsPinning;
|
||||
|
||||
if (supportsPinning &&
|
||||
|
||||
Reference in New Issue
Block a user