|
8 | 8 | <conv:IntToEnumerableConverter x:Key="IntToEnumerableConverter" /> |
9 | 9 |
|
10 | 10 | <DataTemplate x:Key="PegsTemplate" x:Name="PegsTemplate"> |
11 | | - <Grid> |
| 11 | + <Grid |
| 12 | + Margin="-13,0" |
| 13 | + Background="{ThemeResource CardBackgroundFillColorDefault}" |
| 14 | + CornerRadius="{ThemeResource ControlCornerRadius}"> |
12 | 15 | <Grid.ColumnDefinitions> |
13 | 16 | <ColumnDefinition Width="auto" /> |
14 | 17 | <ColumnDefinition Width="auto" /> |
15 | 18 | <ColumnDefinition Width="auto" /> |
16 | 19 | </Grid.ColumnDefinitions> |
17 | | - <TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber}" FontSize="{ThemeResource LargeFontSize}" Margin="20,0" VerticalAlignment="Center" /> |
18 | | - <Border Grid.Column="1" BorderThickness="2,2,0,2" BorderBrush="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="7" CornerRadius="5,0,0,5"> |
| 20 | + <TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber}" FontSize="{ThemeResource LargeFontSize}" Margin="48,0" VerticalAlignment="Center" /> |
| 21 | + <Border Grid.Column="1" Margin="20,0,0,0" Padding="7" x:Name="ShadowTarget"> |
19 | 22 | <ItemsControl ItemsSource="{Binding Path=GuessPegs}"> |
20 | 23 | <ItemsControl.ItemsPanel> |
21 | 24 | <ItemsPanelTemplate> |
22 | | - <StackPanel Orientation="Horizontal" Margin="16,0,0,0" /> |
| 25 | + <StackPanel Orientation="Horizontal" Spacing="27" /> |
23 | 26 | </ItemsPanelTemplate> |
24 | 27 | </ItemsControl.ItemsPanel> |
25 | 28 | <ItemsControl.ItemTemplate> |
26 | 29 | <DataTemplate> |
27 | | - <Ellipse Width="68" Height="68" Margin="12,4" Fill="{Binding Converter={StaticResource ColorConverter}}" /> |
| 30 | + <Grid> |
| 31 | + <Ellipse Width="68" Height="68" Margin="12,4" Fill="{Binding Converter={StaticResource ColorConverter}}" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" /> |
| 32 | + </Grid> |
28 | 33 | </DataTemplate> |
29 | 34 | </ItemsControl.ItemTemplate> |
30 | 35 | </ItemsControl> |
31 | 36 | </Border> |
32 | 37 |
|
33 | | - <Border Grid.Column="2" BorderThickness="0,2,2,2" BorderBrush="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="30,7" CornerRadius="0,5,5,0"> |
| 38 | + <Border Grid.Column="2" Padding="30,7" Margin="12,0,0,0" MinWidth="130"> |
34 | 39 | <Grid> |
35 | 40 | <Grid.RowDefinitions> |
36 | 41 | <RowDefinition /> |
|
44 | 49 | </ItemsControl.ItemsPanel> |
45 | 50 | <ItemsControl.ItemTemplate> |
46 | 51 | <DataTemplate> |
47 | | - <Ellipse Width="16" Height="16" Fill="White" /> |
| 52 | + <Ellipse Width="25" Height="25" Fill="White" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" /> |
48 | 53 | </DataTemplate> |
49 | 54 | </ItemsControl.ItemTemplate> |
50 | 55 | </ItemsControl> |
|
56 | 61 | </ItemsControl.ItemsPanel> |
57 | 62 | <ItemsControl.ItemTemplate> |
58 | 63 | <DataTemplate> |
59 | | - <Ellipse Width="16" Height="16" Fill="Black" /> |
| 64 | + <Ellipse Width="25" Height="25" Fill="Black" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" /> |
60 | 65 | </DataTemplate> |
61 | 66 | </ItemsControl.ItemTemplate> |
62 | 67 | </ItemsControl> |
|
0 commit comments