From 38053666a06102f0374142018189530f0aaf9e46 Mon Sep 17 00:00:00 2001
From: azakhi <azak.halilibrahim@gmail.com>
Date: Fri, 10 Aug 2018 22:22:25 +0300
Subject: [PATCH] Fix collapsed section height

---
 .../BooleanToBlockMarginConverter.cs          | 27 +++++++++++++++++++
 Filtration/Filtration.csproj                  |  1 +
 Filtration/Views/ItemFilterBlockView.xaml     |  3 ++-
 .../Views/ItemFilterCommentBlockView.xaml     |  2 +-
 Filtration/Views/ItemFilterScriptView.xaml    |  2 +-
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 Filtration/Converters/BooleanToBlockMarginConverter.cs

diff --git a/Filtration/Converters/BooleanToBlockMarginConverter.cs b/Filtration/Converters/BooleanToBlockMarginConverter.cs
new file mode 100644
index 0000000..416d4c2
--- /dev/null
+++ b/Filtration/Converters/BooleanToBlockMarginConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Filtration.Converters
+{
+    public class BooleanToBlockMarginConverter : IValueConverter
+    {
+        public double Length { get; set; }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var item = (bool)value;
+
+            if (!item)
+                return new Thickness(2, 0, 2, 0);
+
+            return new Thickness(2, 2, 2, 2);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((Thickness)value) == new Thickness(0, 0, 0, 0);
+        }
+    }
+}
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 4e0f402..fc275ee 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -167,6 +167,7 @@
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.cs" />
+    <Compile Include="Converters\BooleanToBlockMarginConverter.cs" />
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
     <Compile Include="Converters\TreeViewMarginConverter.cs" />
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index 816cc71..ce00d76 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -18,6 +18,7 @@
                 <ResourceDictionary>
                     <views:BindingProxy x:Key="Proxy" Data="{Binding}" />
                     <converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
+                    <converters:BooleanToBlockMarginConverter x:Key="BooleanToBlockMarginConverter"/>
                     <Style TargetType="{x:Type ContentPresenter}" x:Key="BlockItemFadeInStyle">
                         <Setter Property="LayoutTransform">
                             <Setter.Value>
@@ -40,7 +41,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid x:Name="TopLevelGrid">
+    <Grid x:Name="TopLevelGrid" Margin="{Binding IsVisible, Converter={StaticResource BooleanToBlockMarginConverter}}">
         <Grid x:Name="DisabledBlockOverlay" IsHitTestVisible="False" Panel.ZIndex="1000" Visibility="{Binding BlockEnabled, Converter={StaticResource InverseBooleanVisibilityConverter}}">
             <Grid.Background>
                 <SolidColorBrush Color="Gray" Opacity=".5" />
diff --git a/Filtration/Views/ItemFilterCommentBlockView.xaml b/Filtration/Views/ItemFilterCommentBlockView.xaml
index 2e561c8..3db259b 100644
--- a/Filtration/Views/ItemFilterCommentBlockView.xaml
+++ b/Filtration/Views/ItemFilterCommentBlockView.xaml
@@ -46,7 +46,7 @@
         </ResourceDictionary>
         
     </UserControl.Resources>
-    <Grid>
+    <Grid Margin="2">
         <Grid.ContextMenu>
             <ContextMenu>
                 <ContextMenu.Items>
diff --git a/Filtration/Views/ItemFilterScriptView.xaml b/Filtration/Views/ItemFilterScriptView.xaml
index f258054..2d6b7ba 100644
--- a/Filtration/Views/ItemFilterScriptView.xaml
+++ b/Filtration/Views/ItemFilterScriptView.xaml
@@ -72,7 +72,7 @@
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate TargetType="ListBoxItem">
-                                        <Border Name="Border" Padding="2" SnapsToDevicePixels="true">
+                                        <Border Name="Border" SnapsToDevicePixels="true">
                                             <ContentPresenter />
                                         </Border>
                                         <ControlTemplate.Triggers>