From 918ebc62a29e191187de5ea2e5427d3377aa4681 Mon Sep 17 00:00:00 2001
From: vldmr11080 <57061786+vldmr11080@users.noreply.github.com>
Date: Fri, 20 Dec 2019 19:46:14 +0100
Subject: [PATCH] When spacing is set to 0 or turned off display 1px border so
 user can distinguish zone edges. No spacing will be applied in actual layout.
 (#994)

---
 .../fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs    | 5 +++--
 src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs
index ef786169ba..a065b55386 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs
@@ -557,8 +557,9 @@ namespace FancyZonesEditor
             }
 
             Settings settings = ((App)Application.Current).ZoneSettings;
-            int spacing = settings.Spacing;
-            int gutter = settings.Spacing;
+
+            int spacing, gutter;
+            spacing = gutter = settings.ShowSpacing ? settings.Spacing : 0;
 
             int cols = model.Columns;
             int rows = model.Rows;
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
index fd256c1988..d7c37d979b 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
@@ -6,6 +6,8 @@
              xmlns:local="clr-namespace:FancyZonesEditor"
              mc:Ignorable="d" 
             Background="LightGray"
+            BorderThickness="1"
+            BorderBrush="SlateGray"
               Opacity="0.5"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid x:Name="Frame" Visibility="Collapsed">