Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-11 05:52:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[RegistryPreview][UI]Update all AppBarButtons to use an explicit Icon(#27770)

Browse Source 
* Fix for 27766

Removes the Icon property from all AppBarButtons and adds FontFamily for all Glyph's

* Update MainWindow.xaml

Removing a "Windows 11-only" glyph to prevent UI issues.
This commit is contained in:
Randy
2023-08-08 05:14:09 -07:00
committed by GitHub
parent 64252192fa
commit f6e9b08855
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml
View File

@@ -95,7 +95,7 @@
x:Uid="OpenButton" x:Uid="OpenButton"
Click="OpenButton_Click"> Click="OpenButton_Click">
<AppBarButton.Icon> <AppBarButton.Icon>
<FontIcon Glyph="&#xe8e5;"/> <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8e5;"/>
</AppBarButton.Icon> </AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="O" Modifiers="Control" /> <KeyboardAccelerator Key="O" Modifiers="Control" />
@@ -104,8 +104,10 @@
<AppBarButton <AppBarButton
x:Name="refreshButton" x:Name="refreshButton"
x:Uid="RefreshButton" x:Uid="RefreshButton"
Icon="Refresh"
Click="RefreshButton_Click"> Click="RefreshButton_Click">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe72c;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" /> <KeyboardAccelerator Key="F5" />
</AppBarButton.KeyboardAccelerators> </AppBarButton.KeyboardAccelerators>
@@ -114,9 +116,11 @@
<AppBarButton <AppBarButton
x:Name="saveButton" x:Name="saveButton"
x:Uid="SaveButton" x:Uid="SaveButton"
Icon="Save"
Click="SaveButton_Click" Click="SaveButton_Click"
IsEnabled="False"> IsEnabled="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe74e;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="S" Modifiers="Control" /> <KeyboardAccelerator Key="S" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators> </AppBarButton.KeyboardAccelerators>
@@ -127,7 +131,7 @@
Click="SaveAsButton_Click" Click="SaveAsButton_Click"
IsEnabled="True"> IsEnabled="True">
<AppBarButton.Icon> <AppBarButton.Icon>
<FontIcon Glyph="&#xe792;"/> <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe792;"/>
</AppBarButton.Icon> </AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="S" Modifiers="Control,Shift" /> <KeyboardAccelerator Key="S" Modifiers="Control,Shift" />
@@ -137,8 +141,10 @@
<AppBarButton <AppBarButton
x:Name="editButton" x:Name="editButton"
x:Uid="EditButton" x:Uid="EditButton"
Icon="Edit"
Click="EditButton_Click"> Click="EditButton_Click">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8a7;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="E" Modifiers="Control" /> <KeyboardAccelerator Key="E" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators> </AppBarButton.KeyboardAccelerators>
@@ -147,6 +153,9 @@
x:Name="writeButton" x:Name="writeButton"
x:Uid="WriteButton" x:Uid="WriteButton"
Click="WriteButton_Click"> Click="WriteButton_Click">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe72d;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="W" Modifiers="Control" /> <KeyboardAccelerator Key="W" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators> </AppBarButton.KeyboardAccelerators>
@@ -155,6 +164,9 @@
x:Name="registryButton" x:Name="registryButton"
x:Uid="RegistryButton" x:Uid="RegistryButton"
Click="RegistryButton_Click"> Click="RegistryButton_Click">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8ad;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators> <AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="R" Modifiers="Control" /> <KeyboardAccelerator Key="R" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators> </AppBarButton.KeyboardAccelerators>