mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-25 08:00:01 +01:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Implements comprehensive hotkey conflict detection and resolution system for PowerToys, providing real-time conflict checking and centralized management interface. ## PR Checklist - [ ] **Closes:** #xxx - [x] **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 - [x] **Localization:** All end-user-facing strings can be localized - [x] **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) - [x] **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: [Shortcut conflict detction dev spec](https://github.com/MicrosoftDocs/windows-dev-docs/pull/5519) ## TODO Lists - [x] Add real-time hotkey validation functionality to the hotkey dialog - [x] Immediately detect conflicts and update shortcut conflict status after applying new shortcuts - [x] Return conflict list from runner hotkey conflict detector for conflict checking. - [x] Implement the Tooltip for every shortcut control - [x] Add dialog UI for showing all the shortcut conflicts - [x] Support changing shortcut directly inside the shortcut conflict window/dialog, no need to nav to the settings page. - [x] Redesign the `ShortcutConflictDialogContentControl` to align with the spec - [x] Add navigating and changing hotkey auctionability to the `ShortcutConflictDialogContentControl` - [x] Add telemetry. Impemented in [another PR](https://github.com/shuaiyuanxx/PowerToys/pull/47) ## Shortcut Conflict Support Modules  <details> <summary>Demo videos</summary> https://github.com/user-attachments/assets/476d992c-c6ca-4bcd-a3f2-b26cc612d1b9 https://github.com/user-attachments/assets/1c1a2537-de54-4db2-bdbf-6f1908ff1ce7 https://github.com/user-attachments/assets/9c992254-fc2b-402c-beec-20fceef25e6b https://github.com/user-attachments/assets/d66abc1c-b8bf-45f8-a552-ec989dab310f </details> <!-- 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 Manually validation performed. --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
252 lines
10 KiB
C#
252 lines
10 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
|
using Microsoft.PowerToys.Settings.UI.Services;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|
{
|
|
public abstract class PageViewModelBase : Observable, IDisposable
|
|
{
|
|
private readonly Dictionary<string, bool> _hotkeyConflictStatus = new Dictionary<string, bool>();
|
|
private readonly Dictionary<string, string> _hotkeyConflictTooltips = new Dictionary<string, string>();
|
|
private bool _disposed;
|
|
|
|
protected abstract string ModuleName { get; }
|
|
|
|
protected PageViewModelBase()
|
|
{
|
|
if (GlobalHotkeyConflictManager.Instance != null)
|
|
{
|
|
GlobalHotkeyConflictManager.Instance.ConflictsUpdated += OnConflictsUpdated;
|
|
}
|
|
}
|
|
|
|
public virtual void OnPageLoaded()
|
|
{
|
|
Debug.WriteLine($"=== PAGE LOADED: {ModuleName} ===");
|
|
GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Handles updates to hotkey conflicts for the module. This method is called when the
|
|
/// <see cref="GlobalHotkeyConflictManager"/> raises the <c>ConflictsUpdated</c> event.
|
|
/// </summary>
|
|
/// <param name="sender">The source of the event, typically the <see cref="GlobalHotkeyConflictManager"/> instance.</param>
|
|
/// <param name="e">An <see cref="AllHotkeyConflictsEventArgs"/> object containing details about the hotkey conflicts.</param>
|
|
/// <remarks>
|
|
/// Derived classes can override this method to provide custom handling for hotkey conflicts.
|
|
/// Ensure that the overridden method maintains the expected behavior of processing and logging conflict data.
|
|
/// </remarks>
|
|
protected virtual void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
|
|
{
|
|
UpdateHotkeyConflictStatus(e.Conflicts);
|
|
var allHotkeySettings = GetAllHotkeySettings();
|
|
|
|
void UpdateConflictProperties()
|
|
{
|
|
if (allHotkeySettings != null)
|
|
{
|
|
foreach (KeyValuePair<string, HotkeySettings[]> kvp in allHotkeySettings)
|
|
{
|
|
var module = kvp.Key;
|
|
var hotkeySettingsList = kvp.Value;
|
|
|
|
for (int i = 0; i < hotkeySettingsList.Length; i++)
|
|
{
|
|
var key = $"{module.ToLowerInvariant()}_{i}";
|
|
hotkeySettingsList[i].HasConflict = GetHotkeyConflictStatus(key);
|
|
hotkeySettingsList[i].ConflictDescription = GetHotkeyConflictTooltip(key);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
_ = Task.Run(() =>
|
|
{
|
|
try
|
|
{
|
|
var settingsWindow = App.GetSettingsWindow();
|
|
settingsWindow.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, UpdateConflictProperties);
|
|
}
|
|
catch
|
|
{
|
|
UpdateConflictProperties();
|
|
}
|
|
});
|
|
}
|
|
|
|
public virtual Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
protected ModuleConflictsData GetModuleRelatedConflicts(AllHotkeyConflictsData allConflicts)
|
|
{
|
|
var moduleConflicts = new ModuleConflictsData();
|
|
|
|
if (allConflicts.InAppConflicts != null)
|
|
{
|
|
foreach (var conflict in allConflicts.InAppConflicts)
|
|
{
|
|
if (IsModuleInvolved(conflict))
|
|
{
|
|
moduleConflicts.InAppConflicts.Add(conflict);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (allConflicts.SystemConflicts != null)
|
|
{
|
|
foreach (var conflict in allConflicts.SystemConflicts)
|
|
{
|
|
if (IsModuleInvolved(conflict))
|
|
{
|
|
moduleConflicts.SystemConflicts.Add(conflict);
|
|
}
|
|
}
|
|
}
|
|
|
|
return moduleConflicts;
|
|
}
|
|
|
|
private void ProcessMouseUtilsConflictGroup(HotkeyConflictGroupData conflict, HashSet<string> mouseUtilsModules, bool isSysConflict)
|
|
{
|
|
// Check if any of the modules in this conflict are MouseUtils submodules
|
|
var involvedMouseUtilsModules = conflict.Modules
|
|
.Where(module => mouseUtilsModules.Contains(module.ModuleName))
|
|
.ToList();
|
|
|
|
if (involvedMouseUtilsModules.Count != 0)
|
|
{
|
|
// For each involved MouseUtils module, mark the hotkey as having a conflict
|
|
foreach (var module in involvedMouseUtilsModules)
|
|
{
|
|
string hotkeyKey = $"{module.ModuleName.ToLowerInvariant()}_{module.HotkeyID}";
|
|
_hotkeyConflictStatus[hotkeyKey] = true;
|
|
_hotkeyConflictTooltips[hotkeyKey] = isSysConflict
|
|
? ResourceLoaderInstance.ResourceLoader.GetString("SysHotkeyConflictTooltipText")
|
|
: ResourceLoaderInstance.ResourceLoader.GetString("InAppHotkeyConflictTooltipText");
|
|
}
|
|
}
|
|
}
|
|
|
|
protected virtual void UpdateHotkeyConflictStatus(AllHotkeyConflictsData allConflicts)
|
|
{
|
|
_hotkeyConflictStatus.Clear();
|
|
_hotkeyConflictTooltips.Clear();
|
|
|
|
// Since MouseUtils in Settings consolidates four modules: Find My Mouse, Mouse Highlighter, Mouse Pointer Crosshairs, and Mouse Jump
|
|
// We need to handle this case separately here.
|
|
if (string.Equals(ModuleName, "MouseUtils", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
var mouseUtilsModules = new HashSet<string>
|
|
{
|
|
FindMyMouseSettings.ModuleName,
|
|
MouseHighlighterSettings.ModuleName,
|
|
MousePointerCrosshairsSettings.ModuleName,
|
|
MouseJumpSettings.ModuleName,
|
|
};
|
|
|
|
// Process in-app conflicts
|
|
foreach (var conflict in allConflicts.InAppConflicts)
|
|
{
|
|
ProcessMouseUtilsConflictGroup(conflict, mouseUtilsModules, false);
|
|
}
|
|
|
|
// Process system conflicts
|
|
foreach (var conflict in allConflicts.SystemConflicts)
|
|
{
|
|
ProcessMouseUtilsConflictGroup(conflict, mouseUtilsModules, true);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (allConflicts.InAppConflicts.Count > 0)
|
|
{
|
|
foreach (var conflictGroup in allConflicts.InAppConflicts)
|
|
{
|
|
foreach (var conflict in conflictGroup.Modules)
|
|
{
|
|
if (string.Equals(conflict.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
var keyName = $"{conflict.ModuleName.ToLowerInvariant()}_{conflict.HotkeyID}";
|
|
_hotkeyConflictStatus[keyName] = true;
|
|
_hotkeyConflictTooltips[keyName] = ResourceLoaderInstance.ResourceLoader.GetString("InAppHotkeyConflictTooltipText");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (allConflicts.SystemConflicts.Count > 0)
|
|
{
|
|
foreach (var conflictGroup in allConflicts.SystemConflicts)
|
|
{
|
|
foreach (var conflict in conflictGroup.Modules)
|
|
{
|
|
if (string.Equals(conflict.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
var keyName = $"{conflict.ModuleName.ToLowerInvariant()}_{conflict.HotkeyID}";
|
|
_hotkeyConflictStatus[keyName] = true;
|
|
_hotkeyConflictTooltips[keyName] = ResourceLoaderInstance.ResourceLoader.GetString("SysHotkeyConflictTooltipText");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
protected virtual bool GetHotkeyConflictStatus(string key)
|
|
{
|
|
return _hotkeyConflictStatus.ContainsKey(key) && _hotkeyConflictStatus[key];
|
|
}
|
|
|
|
protected virtual string GetHotkeyConflictTooltip(string key)
|
|
{
|
|
return _hotkeyConflictTooltips.TryGetValue(key, out string value) ? value : null;
|
|
}
|
|
|
|
private bool IsModuleInvolved(HotkeyConflictGroupData conflict)
|
|
{
|
|
if (conflict.Modules == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return conflict.Modules.Any(module =>
|
|
string.Equals(module.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase));
|
|
}
|
|
|
|
public virtual void Dispose()
|
|
{
|
|
Dispose(true);
|
|
GC.SuppressFinalize(this);
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (!_disposed)
|
|
{
|
|
if (disposing)
|
|
{
|
|
if (GlobalHotkeyConflictManager.Instance != null)
|
|
{
|
|
GlobalHotkeyConflictManager.Instance.ConflictsUpdated -= OnConflictsUpdated;
|
|
}
|
|
}
|
|
|
|
_disposed = true;
|
|
}
|
|
}
|
|
}
|
|
}
|