From 420a24e60702e561fb00f99a17f009855de64c56 Mon Sep 17 00:00:00 2001
From: Seraphima Zykova <zykovas91@gmail.com>
Date: Fri, 4 Nov 2022 16:21:05 +0200
Subject: [PATCH] [FancyZones] Fix: 'Space around zones' toggle does not turn
 off spacing (#21658)

---
 src/modules/fancyzones/FancyZonesLib/Layout.cpp      | 12 +++++++-----
 .../FancyZonesTests/UnitTests/Layout.Spec.cpp        |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/fancyzones/FancyZonesLib/Layout.cpp b/src/modules/fancyzones/FancyZonesLib/Layout.cpp
index ae1c352c0a..64b172d3f8 100644
--- a/src/modules/fancyzones/FancyZonesLib/Layout.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/Layout.cpp
@@ -122,29 +122,31 @@ bool Layout::Init(const FancyZonesUtils::Rect& workArea, HMONITOR monitor) noexc
         return false;
     }
 
+    auto spacing = m_data.showSpacing ? m_data.spacing : 0; 
+
     switch (m_data.type)
     {
     case FancyZonesDataTypes::ZoneSetLayoutType::Focus:
         m_zones = LayoutConfigurator::Focus(workArea, m_data.zoneCount);
         break;
     case FancyZonesDataTypes::ZoneSetLayoutType::Columns:
-        m_zones = LayoutConfigurator::Columns(workArea, m_data.zoneCount, m_data.spacing);
+        m_zones = LayoutConfigurator::Columns(workArea, m_data.zoneCount, spacing);
         break;
     case FancyZonesDataTypes::ZoneSetLayoutType::Rows:
-        m_zones = LayoutConfigurator::Rows(workArea, m_data.zoneCount, m_data.spacing);
+        m_zones = LayoutConfigurator::Rows(workArea, m_data.zoneCount, spacing);
         break;
     case FancyZonesDataTypes::ZoneSetLayoutType::Grid:
-        m_zones = LayoutConfigurator::Grid(workArea, m_data.zoneCount, m_data.spacing);
+        m_zones = LayoutConfigurator::Grid(workArea, m_data.zoneCount, spacing);
         break;
     case FancyZonesDataTypes::ZoneSetLayoutType::PriorityGrid:
-        m_zones = LayoutConfigurator::PriorityGrid(workArea, m_data.zoneCount, m_data.spacing);
+        m_zones = LayoutConfigurator::PriorityGrid(workArea, m_data.zoneCount, spacing);
         break;
     case FancyZonesDataTypes::ZoneSetLayoutType::Custom:
     {
         const auto customLayoutData = CustomLayouts::instance().GetCustomLayoutData(m_data.uuid);
         if (customLayoutData.has_value())
         {
-            m_zones = LayoutConfigurator::Custom(workArea, monitor, customLayoutData.value(), m_data.spacing);
+            m_zones = LayoutConfigurator::Custom(workArea, monitor, customLayoutData.value(), spacing);
         }
         else
         {
diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp b/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
index 616d50b928..652517e3f7 100644
--- a/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
+++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
@@ -21,7 +21,7 @@ namespace FancyZonesUnitTests
         {
             .uuid = FancyZonesUtils::GuidFromString(L"{F762BAD6-DAA1-4997-9497-E11DFEB72F21}").value(),
             .type = ZoneSetLayoutType::Grid,
-            .showSpacing = false,
+            .showSpacing = true,
             .spacing = 17,
             .zoneCount = 4,
             .sensitivityRadius = 33
@@ -192,7 +192,7 @@ namespace FancyZonesUnitTests
         const LayoutData m_data{
             .uuid = FancyZonesUtils::GuidFromString(L"{33A2B101-06E0-437B-A61E-CDBECF502906}").value(),
             .type = ZoneSetLayoutType::Grid,
-            .showSpacing = false,
+            .showSpacing = true,
             .spacing = 17,
             .zoneCount = 4,
             .sensitivityRadius = 33