mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed block selection style and section style

This commit is contained in:
Ben 2015-06-04 23:30:40 +01:00
parent 504be3a88b
commit 526c4228bd
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Filtration/Views/LootFilterBlockView.xaml
View File

@ -22,7 +22,7 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Grid x:Name="TopLevelGrid"> <Grid x:Name="TopLevelGrid">
<Border BorderThickness="1" BorderBrush="SlateGray" CornerRadius="2"> <Border BorderThickness="1" BorderBrush="SlateGray" CornerRadius="2" Background="White">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />

4
Filtration/Views/LootFilterScriptView.xaml
View File

@ -7,6 +7,7 @@
xmlns:viewModels="clr-namespace:Filtration.ViewModels" xmlns:viewModels="clr-namespace:Filtration.ViewModels"
xmlns:userControls="clr-namespace:Filtration.UserControls" xmlns:userControls="clr-namespace:Filtration.UserControls"
xmlns:fa="http://schemas.fontawesome.io/icons/" xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:dragAndDropLib="clr-namespace:DragAndDropLib;assembly=DragAndDropLib"
mc:Ignorable="d" mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=viewModels:LootFilterScriptViewModel}" d:DataContext="{d:DesignInstance Type=viewModels:LootFilterScriptViewModel}"
d:DesignHeight="300" d:DesignWidth="600"> d:DesignHeight="300" d:DesignWidth="600">
@ -105,6 +106,7 @@
</Expander> </Expander>
<userControls:AutoScrollingListBox ItemsSource="{Binding LootFilterBlockViewModels}" <userControls:AutoScrollingListBox ItemsSource="{Binding LootFilterBlockViewModels}"
Margin="5,5,5,5" Margin="5,5,5,5"
Padding="5"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
BorderThickness="0" BorderThickness="0"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@ -113,7 +115,7 @@
SelectedItem="{Binding SelectedBlockViewModel}" x:Name="BlocksListBox"> SelectedItem="{Binding SelectedBlockViewModel}" x:Name="BlocksListBox">
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
<Setter Property="BorderBrush" Value="Red"/> <!--<Setter Property="BorderBrush" Value="Red"/>-->
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsSelected" Value="True"> <Trigger Property="IsSelected" Value="True">
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>

21
Filtration/Views/LootFilterSectionView.xaml
View File

@ -15,21 +15,14 @@
</Style.Setters> </Style.Setters>
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Grid>
<Grid> <Grid.ColumnDefinitions>
<Grid.ColumnDefinitions> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> </Grid.ColumnDefinitions>
</Grid.ColumnDefinitions> <Border Width="7" Grid.Column="0" BorderBrush="Gray" Background="Gray" CornerRadius="2,0,0,2" />
<Rectangle Width="7" Grid.Column="0"> <Border Grid.Column =" 1" BorderThickness="1" BorderBrush="SlateGray" Background="Gainsboro" CornerRadius="0,2,2,0" Padding="3">
<Rectangle.Fill>
<SolidColorBrush Color="Gray" />
</Rectangle.Fill>
</Rectangle>
<Border Grid.Column =" 1" BorderThickness="1" BorderBrush="SlateGray" Background="Gainsboro" CornerRadius="2" Padding="3">
<TextBox Text="{Binding BlockDescription, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextWrapping="Wrap"/> <TextBox Text="{Binding BlockDescription, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextWrapping="Wrap"/>
</Border> </Border>
</Grid> </Grid>
</UserControl> </UserControl>