Skip to content

Commit 0f4aa08

Browse files
committed
Adapted spacings
1 parent 790c2bc commit 0f4aa08

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/Views/Components/PegSelectionView.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Command="{Binding SetMoveCommand, Mode=OneWay}">
4545
<Grid RowDefinitions="*,5">
4646
<TextBlock Grid.Row="0" Text="Set Move" TextAlignment="Center" VerticalAlignment="Center" MinWidth="100" />
47-
<ProgressBar Grid.Row="1" IsIndeterminate="True" Margin="0,4,0,0" IsVisible="{Binding InProgress, Mode=OneWay}" />
47+
<ProgressBar Grid.Row="1" IsIndeterminate="True" Margin="0,4,0,0" IsVisible="{Binding InProgress, Mode=OneWay}" HorizontalAlignment="Stretch" />
4848
</Grid>
4949
</Button>
5050
</StackPanel>

src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/Views/Pages/GamePage.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<converter:GameStatusToBooleanConverter x:Key="GameStatusToBooleanConverter" />
1616
</UserControl.Resources>
1717
<Grid RowDefinitions="Auto,Auto,*">
18-
<components:InfoBarArea Grid.Row="0"/>
18+
<components:InfoBarArea Grid.Row="0" Margin="0,0,0,20"/>
1919
<Grid Grid.Row="1"
2020
RowDefinitions="Auto,*"
2121
ColumnDefinitions="3*,1*"
@@ -33,15 +33,15 @@
3333
<components:PegSelectionView
3434
Grid.Row="1"
3535
IsVisible="{Binding GameStatus, Mode=OneWay, Converter={StaticResource GameStatusToBooleanConverter}, ConverterParameter=Cancelable}"
36-
Margin="86,0,0,8" />
36+
Margin="55,0,0,15" />
3737
<ItemsControl
3838
IsVisible="{Binding GameStatus, Mode=OneWay, ConverterParameter=Running}"
3939
Grid.Row="2"
4040
ItemsSource="{Binding GameMoves, Mode=OneWay}"
4141
ItemTemplate="{StaticResource PegsTemplate}">
4242
<ItemsControl.ItemsPanel>
4343
<ItemsPanelTemplate>
44-
<StackPanel Orientation="Vertical" />
44+
<StackPanel Orientation="Vertical" Spacing="15" />
4545
</ItemsPanelTemplate>
4646
</ItemsControl.ItemsPanel>
4747
</ItemsControl>

src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/Views/Templates/CodebreakerTemplates.axaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
<ItemsControl ItemsSource="{Binding Path=GuessPegs}" Grid.Column="1">
1313
<ItemsControl.ItemsPanel>
1414
<ItemsPanelTemplate>
15-
<StackPanel Orientation="Horizontal" Margin="16,0,0,0" />
15+
<StackPanel Orientation="Horizontal" Margin="16,0,0,0" Spacing="45" />
1616
</ItemsPanelTemplate>
1717
</ItemsControl.ItemsPanel>
1818
<ItemsControl.ItemTemplate>
1919
<DataTemplate x:DataType="{x:Type system:String}">
20-
<Ellipse Width="68" Height="68" Margin="12,4" Fill="{Binding Converter={StaticResource ColorConverter}}" />
20+
<Ellipse Width="68" Height="68" Fill="{Binding Converter={StaticResource ColorConverter}}" />
2121
</DataTemplate>
2222
</ItemsControl.ItemTemplate>
2323
</ItemsControl>
2424

2525
<ItemsControl Grid.Column="2" ItemsSource="{Binding Path=KeyPegs, Mode=OneTime}">
2626
<ItemsControl.ItemsPanel>
2727
<ItemsPanelTemplate>
28-
<StackPanel Orientation="Horizontal" />
28+
<StackPanel Orientation="Horizontal" Spacing="10" Margin="30,0,0,0" />
2929
</ItemsPanelTemplate>
3030
</ItemsControl.ItemsPanel>
3131
<ItemsControl.ItemTemplate>
3232
<DataTemplate x:DataType="{x:Type system:String}">
33-
<Ellipse Width="16" Height="16" Fill="{Binding Converter={StaticResource KeyPegColorNameToBrushConverter}}" Margin="10,0" />
33+
<Ellipse Width="16" Height="16" Fill="{Binding Converter={StaticResource KeyPegColorNameToBrushConverter}}" />
3434
</DataTemplate>
3535
</ItemsControl.ItemTemplate>
3636
</ItemsControl>

0 commit comments

Comments
 (0)