Skip to content
This repository was archived by the owner on Nov 25, 2023. It is now read-only.

Commit 7718b05

Browse files
committed
Minor adjustments
1 parent 4447e6d commit 7718b05

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/InvvardDev.EZLayoutDisplay.Desktop/Skins/KeyboardLayoutSkin.xaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@
6262
</Style>
6363

6464
<Style TargetType="Viewbox" x:Key="ModifiedLabelViewBox" BasedOn="{StaticResource LabelViewBox}">
65-
<Setter Property="Height" Value="20" />
6665
<Setter Property="StretchDirection" Value="Both" />
67-
<Setter Property="VerticalAlignment" Value="Top" />
68-
<Setter Property="Margin" Value="0 -3 0 0" />
66+
<Setter Property="Margin" Value="0 -5 0 0" />
6967
</Style>
7068

7169
<Style TargetType="Viewbox" x:Key="ModifierViewBox" BasedOn="{StaticResource ModifiedLabelViewBox}">
72-
<Setter Property="Height" Value="10" />
70+
<Setter Property="Height" Value="20" />
7371
</Style>
7472

7573
<Style TargetType="Grid" x:Key="ContentGridBase">
@@ -121,7 +119,8 @@
121119
</Style>
122120

123121
<Style TargetType="Label" x:Key="LayerGlyphStyle" BasedOn="{StaticResource GlyphStyle}">
124-
<Setter Property="FontSize" Value="30" />
122+
<Setter Property="FontSize" Value="25" />
123+
<Setter Property="VerticalAlignment" Value="Center" />
125124
</Style>
126125

127126
<Style TargetType="Label" x:Key="LayerIdLabel" BasedOn="{StaticResource LabelStyle}">
@@ -130,7 +129,7 @@
130129
<Setter Property="Foreground" Value="{StaticResource LayerIdForegroundBrush}" />
131130
<Setter Property="FontWeight" Value="Bold" />
132131
<Setter Property="FontSize" Value="11" />
133-
<Setter Property="Margin" Value="0 4 0 0" />
132+
<Setter Property="Margin" Value="-1 2 0 0" />
134133
</Style>
135134

136135
<DataTemplate x:Key="KeyDataTemplate">
@@ -152,7 +151,7 @@
152151
</DataTemplate>
153152

154153
<DataTemplate x:Key="ModdedGlyphDataTemplate">
155-
<StackPanel Orientation="Vertical">
154+
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
156155
<Viewbox Style="{StaticResource ModifierViewBox}">
157156
<Label Style="{StaticResource LabelStyle}" Content="{Binding Modifier}" />
158157
</Viewbox>
@@ -210,16 +209,16 @@
210209
<Viewbox Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Right" Stretch="None">
211210
<TextBlock Style="{StaticResource PrimaryTag}" Text="{Binding Key.Primary.Tag}" />
212211
</Viewbox>
213-
<Viewbox Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Stretch="None">
212+
<Viewbox Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Stretch="Uniform" Width="17">
214213
<TextBlock Style="{StaticResource SecondaryTag}" Text="{Binding Key.Secondary.Tag}" />
215214
</Viewbox>
216215

217216
<ContentControl ContentTemplateSelector="{StaticResource KeyFeatureTemplateSelector}"
218217
Content="{Binding Key.Primary}"
219-
Grid.Column="0" Grid.Row="0"/>
218+
Grid.Column="0" Grid.Row="0" />
220219
<ContentControl ContentTemplateSelector="{StaticResource KeyFeatureTemplateSelector}"
221220
Content="{Binding Key.Secondary}"
222-
Grid.Column="0" Grid.Row="1"/>
221+
Grid.Column="0" Grid.Row="1" />
223222
</Grid>
224223
</Canvas>
225224
</DataTemplate>

0 commit comments

Comments
 (0)