Skip to content

Commit 121e38f

Browse files
committed
Aligned ellipses and comboboxes
1 parent 1040ee9 commit 121e38f

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/Codebreaker.WinUI/Views/Pages/GamePage.xaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
</Page.Resources>
2222
<Grid x:Name="ContentArea">
2323
<Grid.RowDefinitions>
24-
<RowDefinition Height="auto" />
2524
<RowDefinition Height="auto" />
2625
<RowDefinition Height="auto" />
2726
<RowDefinition Height="*" />
2827
</Grid.RowDefinitions>
2928
<!--Startgame section-->
3029
<Grid
31-
Grid.Row="1"
30+
Grid.Row="0"
3231
ColumnSpacing="25"
3332
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Start}">
3433
<Grid.ColumnDefinitions>
@@ -85,15 +84,18 @@
8584
<TextBlock Text="{cme:ResourceString Name=GamePage_CancelButtonText}" />
8685
</StackPanel>
8786
</Button>-->
88-
<components:PegSelectionComponent
89-
Grid.Row="2"
90-
ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
87+
<components:PegSelectionComponent
88+
Grid.Row="3"
89+
Margin="65,0,0,0"
90+
ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
9191
</StackPanel>
9292
<!--Move section-->
9393
<ListBox
9494
x:Name="listGameMoves"
95-
Grid.Row="3"
95+
Grid.Row="2"
9696
Background="Transparent"
97+
SelectedIndex="-1"
98+
IsHitTestVisible="False"
9799
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Running}"
98100
ItemsSource="{x:Bind ViewModel.GameMoves, Mode=OneWay}"
99101
ItemTemplate="{StaticResource PegsTemplate}" />

src/Codebreaker.WinUI/Views/Templates/CodeBreakerTemplates.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ColumnDefinition Width="auto" />
1818
<ColumnDefinition Width="auto" />
1919
</Grid.ColumnDefinitions>
20-
<TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber}" FontSize="{ThemeResource LargeFontSize}" Margin="48,0" VerticalAlignment="Center" />
20+
<TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber}" FontSize="{ThemeResource LargeFontSize}" Margin="48,0,10,0" VerticalAlignment="Center" />
2121
<Border Grid.Column="1" Margin="20,0,0,0" Padding="7" x:Name="ShadowTarget">
2222
<ItemsControl ItemsSource="{Binding Path=GuessPegs}">
2323
<ItemsControl.ItemsPanel>

0 commit comments

Comments
 (0)