|
@@ -18,51 +18,71 @@
|
|
|
<Setter Property="CornerRadius" Value="10"/>
|
|
|
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
|
|
</Style>
|
|
|
+
|
|
|
+ <Style Selector="ComboBox">
|
|
|
+ <Setter Property="Background" Value="#E6EFD8"/>
|
|
|
+ <Setter Property="CornerRadius" Value="10"/>
|
|
|
+ <Setter Property="VerticalAlignment" Value="Center"/>
|
|
|
+ <Setter Property="BorderBrush" Value="Transparent"/>
|
|
|
+ </Style>
|
|
|
</UserControl.Styles>
|
|
|
|
|
|
- <ScrollViewer>
|
|
|
- <StackPanel Background="#006838">
|
|
|
+ <ScrollViewer>
|
|
|
+ <StackPanel Background="#006838">
|
|
|
<Grid ColumnDefinitions="auto, auto" RowDefinitions="*, auto" Margin="20" HorizontalAlignment="Center">
|
|
|
|
|
|
- <Grid Grid.Column="0" Grid.Row="0" ColumnDefinitions="200, 20, 140, 20, 300, 30" RowDefinitions="auto, 20, *">
|
|
|
+ <Grid Grid.Column="0" Grid.Row="0" ColumnDefinitions="60, 200, 20, 140, 20, 300, 30" RowDefinitions="auto, 20, *">
|
|
|
|
|
|
- <Border Grid.Column="0" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
+ <Border Grid.Column="1" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
<TextBlock Text="Фигура" VerticalAlignment="Stretch" Margin="10" TextAlignment="Center"/>
|
|
|
</Border>
|
|
|
|
|
|
- <Border Grid.Column="2" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
+ <Border Grid.Column="3" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
<TextBlock Text="Цвет" VerticalAlignment="Stretch" Margin="10" TextAlignment="Center"/>
|
|
|
</Border>
|
|
|
|
|
|
- <Border Grid.Column="4" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
+ <Border Grid.Column="5" Grid.Row="0" CornerRadius="10" Background="#E6EFD8">
|
|
|
<TextBlock Text="Положение" VerticalAlignment="Stretch" Margin="10" TextAlignment="Center"/>
|
|
|
</Border>
|
|
|
|
|
|
- <StackPanel Grid.ColumnSpan="5" Grid.Row="2">
|
|
|
- <ListBox ItemsSource="{Binding GameCreateFriendVM.ListElements}">
|
|
|
- <ListBox.ItemTemplate>
|
|
|
+ <StackPanel Grid.ColumnSpan="7" Grid.Row="2">
|
|
|
+ <ItemsControl ItemsSource="{Binding GameCreateFriendVM.ListElements}">
|
|
|
+ <ItemsControl.ItemTemplate>
|
|
|
<DataTemplate>
|
|
|
- <StackPanel Orientation="Horizontal">
|
|
|
- <ComboBox ItemsSource="{Binding CbElement}" SelectedIndex="{Binding SelectedElementIndex}"
|
|
|
- Width="180" Height="130" Margin="0 0 40 0"/>
|
|
|
- <ComboBox ItemsSource="{Binding CbColor}" SelectedIndex="{Binding SelectedColorIndex}"
|
|
|
- Width="120" Height="130" Margin="0 0 40 0"/>
|
|
|
- <ComboBox ItemsSource="{Binding CbNavigateOne}" SelectedIndex="{Binding SelectedNavigateOne}" IsVisible="{Binding IsVisibleNavigateOne}"
|
|
|
- Width="100" Height="80" Margin="0 0 10 0"/>
|
|
|
- <ComboBox ItemsSource="{Binding CbNavigateTwo}" SelectedIndex="{Binding SelectedNavigateTwo}" IsVisible="{Binding IsVisibleNavigateTwo}"
|
|
|
- Width="100" Height="80"/>
|
|
|
- </StackPanel>
|
|
|
+ <Grid ColumnDefinitions="40, 20, *, 30" Margin="0 10">
|
|
|
+
|
|
|
+ <Button Grid.Column="0" Background="#F26527" Width="40" Command="{Binding Delete}"
|
|
|
+ VerticalAlignment="Stretch">
|
|
|
+ <Svg Path="/Assets/ImgCreateFriend/delete.svg" Width="20"/>
|
|
|
+ </Button>
|
|
|
+
|
|
|
+ <Border Grid.Column="2" CornerRadius="10"
|
|
|
+ Background="#7CBE41"
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
+ Padding="10">
|
|
|
+ <StackPanel Orientation="Horizontal">
|
|
|
+ <ComboBox ItemsSource="{Binding CbElement}" SelectedIndex="{Binding SelectedElementIndex}"
|
|
|
+ Width="180" Height="125" Margin="0 0 40 0"/>
|
|
|
+ <ComboBox ItemsSource="{Binding CbColor}" SelectedIndex="{Binding SelectedColorIndex}"
|
|
|
+ Width="120" Height="125" Margin="0 0 40 0"/>
|
|
|
+ <ComboBox ItemsSource="{Binding CbNavigateOne}" SelectedIndex="{Binding SelectedNavigateOne}" IsVisible="{Binding IsVisibleNavigateOne}"
|
|
|
+ Width="130" Height="125" Margin="0 0 10 0"/>
|
|
|
+ <ComboBox ItemsSource="{Binding CbNavigateTwo}" SelectedIndex="{Binding SelectedNavigateTwo}" IsVisible="{Binding IsVisibleNavigateTwo}"
|
|
|
+ Width="130" Height="125"/>
|
|
|
+ </StackPanel>
|
|
|
+ </Border>
|
|
|
+ </Grid>
|
|
|
</DataTemplate>
|
|
|
- </ListBox.ItemTemplate>
|
|
|
- </ListBox>
|
|
|
+ </ItemsControl.ItemTemplate>
|
|
|
+ </ItemsControl>
|
|
|
<Button Content="+" Command="{Binding GameCreateFriendVM.ClickCreateElement}"
|
|
|
- Background="#E6EFD8" Width="200"/>
|
|
|
+ Background="#E6EFD8" Margin="60 0 30 0" HorizontalAlignment="Stretch"/>
|
|
|
</StackPanel>
|
|
|
|
|
|
</Grid>
|
|
|
|
|
|
- <Panel Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Width="400">
|
|
|
- <Image Source="/Assets/ImgCreateFriend/img_friend.png" Width="400"/>
|
|
|
+ <Panel Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" Width="400" Margin="0 0 0 20">
|
|
|
+ <Image Source="/Assets/ImgCreateFriend/img_friend.png" Width="400"/>
|
|
|
<Image Source="/Assets/ImgCreateFriend/hello.png" Width="150" Margin="0 0 140 -100"
|
|
|
IsVisible="{Binding GameCreateFriendVM.IsVisibleHello}"/>
|
|
|
<ContentControl Width="140" Height="180" HorizontalAlignment="Right" VerticalAlignment="Bottom"
|