mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-07 11:46:30 +02: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 This PR implements functionality to ignore specific hotkey conflicts in PowerToys settings. The primary purpose is to allow users to suppress individual shortcut conflict warnings if they find their configurations work correctly despite the detected conflicts. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #41544 - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [x] **Tests:** Added/updated and all pass - [x] **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 - Added hotkey conflict ignore functionality with user-controllable settings - Updated shortcut control UI to support ignore states and clearer conflict messaging - Enhanced conflict detection to respect ignored shortcuts when counting conflicts <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
139 lines
4.9 KiB
C#
139 lines
4.9 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 CommunityToolkit.WinUI.Controls;
|
|
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;
|
|
using Microsoft.PowerToys.Settings.UI.ViewModels;
|
|
using Microsoft.PowerToys.Settings.UI.Views;
|
|
using Microsoft.UI;
|
|
using Microsoft.UI.Windowing;
|
|
using Microsoft.UI.Xaml;
|
|
using Microsoft.UI.Xaml.Controls;
|
|
using Windows.Graphics;
|
|
using WinUIEx;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
|
|
{
|
|
public sealed partial class ShortcutConflictWindow : WindowEx
|
|
{
|
|
public ShortcutConflictViewModel ViewModel { get; private set; }
|
|
|
|
public ShortcutConflictWindow()
|
|
{
|
|
var settingsUtils = new SettingsUtils();
|
|
ViewModel = new ShortcutConflictViewModel(
|
|
settingsUtils,
|
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
|
ShellPage.SendDefaultIPCMessage);
|
|
|
|
InitializeComponent();
|
|
|
|
// Set DataContext on the root Grid instead of the Window
|
|
RootGrid.DataContext = ViewModel;
|
|
|
|
this.Activated += Window_Activated_SetIcon;
|
|
|
|
// Set localized window title
|
|
var resourceLoader = ResourceLoaderInstance.ResourceLoader;
|
|
ExtendsContentIntoTitleBar = true;
|
|
SetTitleBar(titleBar);
|
|
|
|
this.Title = resourceLoader.GetString("ShortcutConflictWindow_Title");
|
|
this.CenterOnScreen();
|
|
|
|
ViewModel.OnPageLoaded();
|
|
}
|
|
|
|
private void CenterOnScreen()
|
|
{
|
|
var displayArea = DisplayArea.GetFromWindowId(this.AppWindow.Id, DisplayAreaFallback.Nearest);
|
|
if (displayArea != null)
|
|
{
|
|
var windowSize = this.AppWindow.Size;
|
|
var centeredPosition = new PointInt32
|
|
{
|
|
X = (displayArea.WorkArea.Width - windowSize.Width) / 2,
|
|
Y = (displayArea.WorkArea.Height - windowSize.Height) / 2,
|
|
};
|
|
this.AppWindow.Move(centeredPosition);
|
|
}
|
|
}
|
|
|
|
private void SettingsCard_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
if (sender is SettingsCard settingsCard &&
|
|
settingsCard.DataContext is ModuleHotkeyData moduleData)
|
|
{
|
|
var moduleType = moduleData.ModuleType;
|
|
NavigationService.Navigate(ModuleHelper.GetModulePageType(moduleType));
|
|
this.Close();
|
|
}
|
|
}
|
|
|
|
private void OnIgnoreConflictClicked(object sender, RoutedEventArgs e)
|
|
{
|
|
if (sender is CheckBox checkBox && checkBox.DataContext is HotkeyConflictGroupData conflictGroup)
|
|
{
|
|
// The Click event only fires from user interaction, not programmatic changes
|
|
if (checkBox.IsChecked == true)
|
|
{
|
|
IgnoreConflictGroup(conflictGroup);
|
|
}
|
|
else
|
|
{
|
|
UnignoreConflictGroup(conflictGroup);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void IgnoreConflictGroup(HotkeyConflictGroupData conflictGroup)
|
|
{
|
|
try
|
|
{
|
|
// Ignore all hotkey settings in this conflict group
|
|
if (conflictGroup.Modules != null)
|
|
{
|
|
HotkeySettings hotkey = new(conflictGroup.Hotkey.Win, conflictGroup.Hotkey.Ctrl, conflictGroup.Hotkey.Alt, conflictGroup.Hotkey.Shift, conflictGroup.Hotkey.Key);
|
|
ViewModel.IgnoreShortcut(hotkey);
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
}
|
|
}
|
|
|
|
private void UnignoreConflictGroup(HotkeyConflictGroupData conflictGroup)
|
|
{
|
|
try
|
|
{
|
|
// Unignore all hotkey settings in this conflict group
|
|
if (conflictGroup.Modules != null)
|
|
{
|
|
HotkeySettings hotkey = new(conflictGroup.Hotkey.Win, conflictGroup.Hotkey.Ctrl, conflictGroup.Hotkey.Alt, conflictGroup.Hotkey.Shift, conflictGroup.Hotkey.Key);
|
|
ViewModel.UnignoreShortcut(hotkey);
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
}
|
|
}
|
|
|
|
private void WindowEx_Closed(object sender, WindowEventArgs args)
|
|
{
|
|
ViewModel?.Dispose();
|
|
}
|
|
|
|
private void Window_Activated_SetIcon(object sender, WindowActivatedEventArgs args)
|
|
{
|
|
// Set window icon
|
|
AppWindow.SetIcon("Assets\\Settings\\icon.ico");
|
|
}
|
|
}
|
|
}
|