|
62 | 62 | </Style> |
63 | 63 |
|
64 | 64 | <Style TargetType="Viewbox" x:Key="ModifiedLabelViewBox" BasedOn="{StaticResource LabelViewBox}"> |
65 | | - <Setter Property="Height" Value="20" /> |
66 | 65 | <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" /> |
69 | 67 | </Style> |
70 | 68 |
|
71 | 69 | <Style TargetType="Viewbox" x:Key="ModifierViewBox" BasedOn="{StaticResource ModifiedLabelViewBox}"> |
72 | | - <Setter Property="Height" Value="10" /> |
| 70 | + <Setter Property="Height" Value="20" /> |
73 | 71 | </Style> |
74 | 72 |
|
75 | 73 | <Style TargetType="Grid" x:Key="ContentGridBase"> |
|
121 | 119 | </Style> |
122 | 120 |
|
123 | 121 | <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" /> |
125 | 124 | </Style> |
126 | 125 |
|
127 | 126 | <Style TargetType="Label" x:Key="LayerIdLabel" BasedOn="{StaticResource LabelStyle}"> |
|
130 | 129 | <Setter Property="Foreground" Value="{StaticResource LayerIdForegroundBrush}" /> |
131 | 130 | <Setter Property="FontWeight" Value="Bold" /> |
132 | 131 | <Setter Property="FontSize" Value="11" /> |
133 | | - <Setter Property="Margin" Value="0 4 0 0" /> |
| 132 | + <Setter Property="Margin" Value="-1 2 0 0" /> |
134 | 133 | </Style> |
135 | 134 |
|
136 | 135 | <DataTemplate x:Key="KeyDataTemplate"> |
|
152 | 151 | </DataTemplate> |
153 | 152 |
|
154 | 153 | <DataTemplate x:Key="ModdedGlyphDataTemplate"> |
155 | | - <StackPanel Orientation="Vertical"> |
| 154 | + <StackPanel Orientation="Vertical" VerticalAlignment="Center"> |
156 | 155 | <Viewbox Style="{StaticResource ModifierViewBox}"> |
157 | 156 | <Label Style="{StaticResource LabelStyle}" Content="{Binding Modifier}" /> |
158 | 157 | </Viewbox> |
|
210 | 209 | <Viewbox Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Right" Stretch="None"> |
211 | 210 | <TextBlock Style="{StaticResource PrimaryTag}" Text="{Binding Key.Primary.Tag}" /> |
212 | 211 | </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"> |
214 | 213 | <TextBlock Style="{StaticResource SecondaryTag}" Text="{Binding Key.Secondary.Tag}" /> |
215 | 214 | </Viewbox> |
216 | 215 |
|
217 | 216 | <ContentControl ContentTemplateSelector="{StaticResource KeyFeatureTemplateSelector}" |
218 | 217 | Content="{Binding Key.Primary}" |
219 | | - Grid.Column="0" Grid.Row="0"/> |
| 218 | + Grid.Column="0" Grid.Row="0" /> |
220 | 219 | <ContentControl ContentTemplateSelector="{StaticResource KeyFeatureTemplateSelector}" |
221 | 220 | Content="{Binding Key.Secondary}" |
222 | | - Grid.Column="0" Grid.Row="1"/> |
| 221 | + Grid.Column="0" Grid.Row="1" /> |
223 | 222 | </Grid> |
224 | 223 | </Canvas> |
225 | 224 | </DataTemplate> |
|
0 commit comments