mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 01:36:31 +02:00
Settings: Fix settings arrow render (#46454)
<!-- 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 Existing: <img width="1201" height="150" alt="image" src="https://github.com/user-attachments/assets/5e764875-bed8-45b5-97a8-60e5f475c296" /> A box icon for whatever up, down, left, right, they are not treated as Glyph icon rendered, instead as normal text <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **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 - [ ] **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 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed <img width="1273" height="714" alt="image" src="https://github.com/user-attachments/assets/4d2ffa92-e0ca-44f4-8eda-9c4a7e05bbde" />
This commit is contained in:
@@ -105,6 +105,22 @@ namespace Microsoft.PowerToys.Common.UI.Controls
|
|||||||
{
|
{
|
||||||
switch (key)
|
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":
|
case "Copilot":
|
||||||
_keyPresenter.Style = (Style)Application.Current.Resources["CopilotKeyCharPresenterStyle"];
|
_keyPresenter.Style = (Style)Application.Current.Resources["CopilotKeyCharPresenterStyle"];
|
||||||
break;
|
break;
|
||||||
@@ -141,19 +157,19 @@ namespace Microsoft.PowerToys.Common.UI.Controls
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case VirtualKey.Up:
|
case VirtualKey.Up:
|
||||||
_keyPresenter.Content = "\uE0E4";
|
SetGlyphOrText("\uE0E4", virtualKey);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VirtualKey.Down:
|
case VirtualKey.Down:
|
||||||
_keyPresenter.Content = "\uE0E5";
|
SetGlyphOrText("\uE0E5", virtualKey);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VirtualKey.Left:
|
case VirtualKey.Left:
|
||||||
_keyPresenter.Content = "\uE0E2";
|
SetGlyphOrText("\uE0E2", virtualKey);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VirtualKey.Right:
|
case VirtualKey.Right:
|
||||||
_keyPresenter.Content = "\uE0E3";
|
SetGlyphOrText("\uE0E3", virtualKey);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VirtualKey.LeftWindows:
|
case VirtualKey.LeftWindows:
|
||||||
|
|||||||
@@ -46,6 +46,7 @@
|
|||||||
Content="{Binding}"
|
Content="{Binding}"
|
||||||
CornerRadius="{StaticResource ControlCornerRadius}"
|
CornerRadius="{StaticResource ControlCornerRadius}"
|
||||||
IsTabStop="False"
|
IsTabStop="False"
|
||||||
|
RenderKeyAsGlyph="True"
|
||||||
State="{Binding ElementName=LayoutRoot, Path=KeyVisualShouldShowConflict, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Warning}"
|
State="{Binding ElementName=LayoutRoot, Path=KeyVisualShouldShowConflict, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Warning}"
|
||||||
Style="{StaticResource AccentKeyVisualStyle}" />
|
Style="{StaticResource AccentKeyVisualStyle}" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -96,4 +97,4 @@
|
|||||||
</VisualStateGroup>
|
</VisualStateGroup>
|
||||||
</VisualStateManager.VisualStateGroups>
|
</VisualStateManager.VisualStateGroups>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -236,6 +236,7 @@
|
|||||||
FontSize="16"
|
FontSize="16"
|
||||||
FontWeight="SemiBold"
|
FontWeight="SemiBold"
|
||||||
IsTabStop="False"
|
IsTabStop="False"
|
||||||
|
RenderKeyAsGlyph="True"
|
||||||
State="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Error}"
|
State="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Error}"
|
||||||
Style="{StaticResource AccentKeyVisualStyle}" />
|
Style="{StaticResource AccentKeyVisualStyle}" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -332,4 +333,4 @@
|
|||||||
</InfoBar>
|
</InfoBar>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
Reference in New Issue
Block a user