Merge branch 'main' into copilot/fix-accessible-name-shortcut-button

Add accessible name to Shortcut Conflicts button
Co-authored-by: niels9001 <9866362+niels9001@users.noreply.github.com>
2026-01-04 03:16:25 +01:00 · 2025-10-17 03:52:44 +02:00 · 2025-10-16 18:33:37 +00:00 · 2025-10-16 18:27:17 +00:00
2 changed files with 14 additions and 1 deletions
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
@@ -9,7 +9,10 @@
    mc:Ignorable="d">

    <Grid>
-        <Button Click="ShortcutConflictBtn_Click" Style="{StaticResource SubtleButtonStyle}">
+        <Button
+            AutomationProperties.Name="{x:Bind AccessibleName, Mode=OneWay}"
+            Click="ShortcutConflictBtn_Click"
+            Style="{StaticResource SubtleButtonStyle}">
            <Grid ColumnSpacing="16">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="Auto" />
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
@@ -88,6 +88,15 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            }
        }

+        public string AccessibleName
+        {
+            get
+            {
+                var title = ResourceLoader.GetString("ShortcutConflictControl_Title");
+                return $"{title}, {ConflictText}";
+            }
+        }
+
        public bool HasConflicts => ConflictCount > 0;

        private static void OnAllHotkeyConflictsDataChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -104,6 +113,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
        {
            OnPropertyChanged(nameof(ConflictCount));
            OnPropertyChanged(nameof(ConflictText));
+            OnPropertyChanged(nameof(AccessibleName));
            OnPropertyChanged(nameof(HasConflicts));

            // Update visibility based on conflict count
Author	SHA1	Message	Date
Niels Laute	4a7e5f583e	Merge branch 'main' into copilot/fix-accessible-name-shortcut-button	2025-10-17 03:52:44 +02:00
copilot-swe-agent[bot]	002ed611c5	Add accessible name to Shortcut Conflicts button Co-authored-by: niels9001 <9866362+niels9001@users.noreply.github.com>	2025-10-16 18:33:37 +00:00
copilot-swe-agent[bot]	838d0328ec	Initial plan	2025-10-16 18:27:17 +00:00