From 526c4228bd7b5307211969ab9f6e6eab9d128d12 Mon Sep 17 00:00:00 2001
From: Ben <ben-wallis@users.noreply.github.com>
Date: Thu, 4 Jun 2015 23:30:40 +0100
Subject: [PATCH] Fixed block selection style and section style

---
 Filtration/Views/LootFilterBlockView.xaml   |  2 +-
 Filtration/Views/LootFilterScriptView.xaml  |  4 +++-
 Filtration/Views/LootFilterSectionView.xaml | 21 +++++++--------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Filtration/Views/LootFilterBlockView.xaml b/Filtration/Views/LootFilterBlockView.xaml
index ddda5d2..0700936 100644
--- a/Filtration/Views/LootFilterBlockView.xaml
+++ b/Filtration/Views/LootFilterBlockView.xaml
@@ -22,7 +22,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid x:Name="TopLevelGrid">
-        <Border BorderThickness="1" BorderBrush="SlateGray" CornerRadius="2">
+        <Border BorderThickness="1" BorderBrush="SlateGray" CornerRadius="2" Background="White">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
diff --git a/Filtration/Views/LootFilterScriptView.xaml b/Filtration/Views/LootFilterScriptView.xaml
index b6c4f18..7495b31 100644
--- a/Filtration/Views/LootFilterScriptView.xaml
+++ b/Filtration/Views/LootFilterScriptView.xaml
@@ -7,6 +7,7 @@
              xmlns:viewModels="clr-namespace:Filtration.ViewModels"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
              xmlns:fa="http://schemas.fontawesome.io/icons/"
+             xmlns:dragAndDropLib="clr-namespace:DragAndDropLib;assembly=DragAndDropLib"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=viewModels:LootFilterScriptViewModel}"
              d:DesignHeight="300" d:DesignWidth="600">
@@ -105,6 +106,7 @@
                 </Expander>
                 <userControls:AutoScrollingListBox ItemsSource="{Binding LootFilterBlockViewModels}"
                                                    Margin="5,5,5,5"
+                                                   Padding="5"
                                                    HorizontalContentAlignment="Stretch"
                                                    BorderThickness="0"
                                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -113,7 +115,7 @@
                                                    SelectedItem="{Binding SelectedBlockViewModel}" x:Name="BlocksListBox">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
-                            <Setter Property="BorderBrush" Value="Red"/>
+                            <!--<Setter Property="BorderBrush" Value="Red"/>-->
                             <Style.Triggers>
                                 <Trigger Property="IsSelected" Value="True">
                                     <Setter Property="BorderThickness" Value="1"/>
diff --git a/Filtration/Views/LootFilterSectionView.xaml b/Filtration/Views/LootFilterSectionView.xaml
index 021cc7d..18d5bd5 100644
--- a/Filtration/Views/LootFilterSectionView.xaml
+++ b/Filtration/Views/LootFilterSectionView.xaml
@@ -15,21 +15,14 @@
             </Style.Setters>
         </Style>
     </UserControl.Resources>
-    
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Rectangle Width="7" Grid.Column="0">
-                <Rectangle.Fill>
-                    <SolidColorBrush Color="Gray" />
-                </Rectangle.Fill>
-            </Rectangle>
-        <Border Grid.Column =" 1"  BorderThickness="1" BorderBrush="SlateGray" Background="Gainsboro" CornerRadius="2" Padding="3">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Border Width="7" Grid.Column="0" BorderBrush="Gray" Background="Gray" CornerRadius="2,0,0,2" />
+        <Border Grid.Column =" 1"  BorderThickness="1" BorderBrush="SlateGray" Background="Gainsboro" CornerRadius="0,2,2,0" Padding="3">
             <TextBox Text="{Binding BlockDescription, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextWrapping="Wrap"/>
         </Border>
     </Grid>
-        
-    
 </UserControl>