[Feature] PowerToys hotkey conflict detection - #40457
Closed
shuaiyuanxx wants to merge 64 commits into
Closed
Conversation
shuaiyuanxx
force-pushed
the
shawn/hotkeyConflictDetect_legacyVersion
branch
from
July 8, 2025 05:03
f8aaf53 to
9a975cb
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
niels9001
requested changes
Jul 12, 2025
shuaiyuanxx
marked this pull request as ready for review
July 16, 2025 07:45
Jaylyn-Barbee
force-pushed
the
niels9001/new-dashboard-ux
branch
from
July 17, 2025 13:51
1f25860 to
6642c80
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request implements a comprehensive hotkey conflict detection and resolution system for PowerToys, providing real-time conflict checking and centralized management interface. It adds conflict detection capabilities to all PowerToys modules with hotkey configurations and creates a unified interface for resolving conflicts.
The key changes include:
- Implementation of
PageViewModelBaseto provide shared hotkey conflict detection functionality - Migration of all module ViewModels to inherit from
PageViewModelBase - Addition of conflict status properties and tooltips to shortcut controls across all modules
Reviewed Changes
Copilot reviewed 154 out of 163 changed files in this pull request and generated 8 comments.
Show a summary per file
| File | Description |
|---|---|
src/settings-ui/Settings.UI/ViewModels/PageViewModelBase.cs |
New base class providing shared hotkey conflict detection functionality |
src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs |
New ViewModel for centralized conflict resolution dialog |
src/settings-ui/Settings.UI/ViewModels/ZoomItViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
src/settings-ui/Settings.UI/ViewModels/WorkspacesViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
src/settings-ui/Settings.UI/ViewModels/ShortcutGuideViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
src/settings-ui/Settings.UI/ViewModels/PowerLauncherViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs |
Migrated to PageViewModelBase with conflict detection support |
| Various module ViewModels | Similar migration patterns with conflict detection properties |
| Various XAML files | Updated to include conflict status bindings for shortcut controls |
Files not reviewed (1)
- src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs: Language not supported
Comments suppressed due to low confidence (1)
src/settings-ui/Settings.UI/ViewModels/PowerLauncherViewModel.cs:204
- Commented out constructor appears to be dead code and should be removed rather than commented out.
)
yeelam-gordon
left a comment
yeelam-gordon
left a comment
Contributor
There was a problem hiding this comment.
I just take a look at all the dllmain only.
Will take a look others later on.
shuaiyuanxx
force-pushed
the
shawn/hotkeyConflictDetect_legacyVersion
branch
from
July 18, 2025 02:48
ade6b30 to
27bb346
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
check-spelling found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
niels9001
requested changes
Jul 18, 2025
yeelam-gordon
left a comment
yeelam-gordon
left a comment
Contributor
There was a problem hiding this comment.
Finished take a look at runner folder
This comment was marked as resolved.
This comment was marked as resolved.
11 tasks
htcfreek
reviewed
Aug 2, 2025
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Added navigation to hotkey conflict detection dialog card. Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
shuaiyuanxx
force-pushed
the
shawn/hotkeyConflictDetect_legacyVersion
branch
from
August 7, 2025 03:31
e820cab to
0e31424
Compare
Contributor
Author
|
Cherry-picked the code to another PR and resolved the conflicts. Closing this PR. |
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 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.
Summary of the Pull Request
Closed this PR due to heavy rebase conflicts. The main changes have been cherry-picked into a new PR: #41029