diff --git a/src/common/Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml.cs b/src/common/Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml.cs index 1439a6e1d9..eebf7a6565 100644 --- a/src/common/Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml.cs +++ b/src/common/Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml.cs @@ -105,6 +105,22 @@ namespace Microsoft.PowerToys.Common.UI.Controls { switch (key) { + case nameof(VirtualKey.Up): + SetGlyphOrText("\uE0E4", VirtualKey.Up); + break; + + case nameof(VirtualKey.Down): + SetGlyphOrText("\uE0E5", VirtualKey.Down); + break; + + case nameof(VirtualKey.Left): + SetGlyphOrText("\uE0E2", VirtualKey.Left); + break; + + case nameof(VirtualKey.Right): + SetGlyphOrText("\uE0E3", VirtualKey.Right); + break; + case "Copilot": _keyPresenter.Style = (Style)Application.Current.Resources["CopilotKeyCharPresenterStyle"]; break; @@ -141,19 +157,19 @@ namespace Microsoft.PowerToys.Common.UI.Controls break; case VirtualKey.Up: - _keyPresenter.Content = "\uE0E4"; + SetGlyphOrText("\uE0E4", virtualKey); break; case VirtualKey.Down: - _keyPresenter.Content = "\uE0E5"; + SetGlyphOrText("\uE0E5", virtualKey); break; case VirtualKey.Left: - _keyPresenter.Content = "\uE0E2"; + SetGlyphOrText("\uE0E2", virtualKey); break; case VirtualKey.Right: - _keyPresenter.Content = "\uE0E3"; + SetGlyphOrText("\uE0E3", virtualKey); break; case VirtualKey.LeftWindows: diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml index 585af5c38b..5900e0615b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml @@ -46,6 +46,7 @@ Content="{Binding}" CornerRadius="{StaticResource ControlCornerRadius}" IsTabStop="False" + RenderKeyAsGlyph="True" State="{Binding ElementName=LayoutRoot, Path=KeyVisualShouldShowConflict, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Warning}" Style="{StaticResource AccentKeyVisualStyle}" /> @@ -96,4 +97,4 @@ - \ No newline at end of file + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml index ce4274ac1d..384b4b63f4 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml @@ -236,6 +236,7 @@ FontSize="16" FontWeight="SemiBold" IsTabStop="False" + RenderKeyAsGlyph="True" State="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Error}" Style="{StaticResource AccentKeyVisualStyle}" /> @@ -332,4 +333,4 @@ - \ No newline at end of file +