Skip to content

Commit

Permalink
[Registry Preview] Fixes in for the command bar in XAML (#25266)
Browse files Browse the repository at this point in the history
* Update MainWindow.xaml

Change the toolbar to have a color, rather than transparent
Added radial corners to the textbox and gridview.

* Update MainWindow.xaml

Changing short  cuts for Save and Save As

* Update MainWindow.xaml

A wise engineer once said "save the file, fool, before committing it to the repro."

* Moved to FontIcons
  • Loading branch information
randyrants committed Apr 11, 2023
1 parent 3b5d601 commit 02349f1
Showing 1 changed file with 28 additions and 10 deletions.
38 changes: 28 additions & 10 deletions src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml
Expand Up @@ -53,6 +53,7 @@
<CommandBar
Name="commandBar"
HorizontalAlignment="Left"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="Transparent"
BorderThickness="0"
DefaultLabelPosition="Right"
Expand All @@ -64,8 +65,10 @@
x:Uid="OpenButton"
HorizontalAlignment="Left"
Click="OpenButton_Click"
Icon="OpenFile"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8e5;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="O" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators>
Expand All @@ -75,32 +78,38 @@
x:Uid="SaveButton"
HorizontalAlignment="Left"
Click="SaveButton_Click"
Icon="Save"
IsEnabled="False"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe74e;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="F2" Modifiers="None" />
<KeyboardAccelerator Key="S" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators>
</AppBarButton>
<AppBarButton
x:Name="saveAsButton"
x:Uid="SaveAsButton"
HorizontalAlignment="Left"
Click="SaveAsButton_Click"
Icon="SaveLocal"
IsEnabled="True"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe792;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="F2" Modifiers="Shift" />
<KeyboardAccelerator Key="S" Modifiers="Control,Shift" />
</AppBarButton.KeyboardAccelerators>
</AppBarButton>
<AppBarButton
x:Name="editButton"
x:Uid="EditButton"
HorizontalAlignment="Left"
Click="EditButton_Click"
Icon="NewWindow"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8a7;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="E" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators>
Expand All @@ -110,8 +119,10 @@
x:Uid="RefreshButton"
HorizontalAlignment="Left"
Click="RefreshButton_Click"
Icon="Refresh"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe72c;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" />
</AppBarButton.KeyboardAccelerators>
Expand All @@ -121,8 +132,10 @@
x:Uid="WriteButton"
HorizontalAlignment="Left"
Click="WriteButton_Click"
Icon="Share"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe72d;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="W" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators>
Expand All @@ -132,8 +145,10 @@
x:Uid="RegistryButton"
HorizontalAlignment="Left"
Click="RegistryButton_Click"
Icon="Go"
IsTabStop="False">
<AppBarButton.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe8ad;"/>
</AppBarButton.Icon>
<AppBarButton.KeyboardAccelerators>
<KeyboardAccelerator Key="R" Modifiers="Control" />
</AppBarButton.KeyboardAccelerators>
Expand Down Expand Up @@ -161,7 +176,9 @@
ScrollViewer.IsVerticalRailEnabled="True"
ScrollViewer.VerticalScrollBarVisibility="Visible"
TabIndex="0"
TextWrapping="NoWrap" />
TextWrapping="NoWrap"
CornerRadius="{StaticResource OverlayCornerRadius}"
/>

<Grid
Grid.Row="1"
Expand Down Expand Up @@ -209,6 +226,7 @@
Grid.RowSpan="2"
Grid.Column="2"
Margin="0,0,8,8"
CornerRadius="{StaticResource OverlayCornerRadius}"
Style="{StaticResource GridCardStyle}">
<controls:DataGrid
x:Name="dataGrid"
Expand Down

0 comments on commit 02349f1

Please sign in to comment.