mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-11 12:14:53 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[FancyZones] Fix: 'Space around zones' toggle does not turn off spacing (#21658)

Browse Source
This commit is contained in:
Seraphima Zykova 2022-11-04 16:21:05 +02:00 committed by GitHub
parent d234536cf7
commit 420a24e607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/fancyzones/FancyZonesLib/Layout.cpp
View File

@ -122,29 +122,31 @@ bool Layout::Init(const FancyZonesUtils::Rect& workArea, HMONITOR monitor) noexc
return false; return false;
} }
auto spacing = m_data.showSpacing ? m_data.spacing : 0;
switch (m_data.type) switch (m_data.type)
{ {
case FancyZonesDataTypes::ZoneSetLayoutType::Focus: case FancyZonesDataTypes::ZoneSetLayoutType::Focus:
m_zones = LayoutConfigurator::Focus(workArea, m_data.zoneCount); m_zones = LayoutConfigurator::Focus(workArea, m_data.zoneCount);
break; break;
case FancyZonesDataTypes::ZoneSetLayoutType::Columns: 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; break;
case FancyZonesDataTypes::ZoneSetLayoutType::Rows: 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; break;
case FancyZonesDataTypes::ZoneSetLayoutType::Grid: 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; break;
case FancyZonesDataTypes::ZoneSetLayoutType::PriorityGrid: 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; break;
case FancyZonesDataTypes::ZoneSetLayoutType::Custom: case FancyZonesDataTypes::ZoneSetLayoutType::Custom:
{ {
const auto customLayoutData = CustomLayouts::instance().GetCustomLayoutData(m_data.uuid); const auto customLayoutData = CustomLayouts::instance().GetCustomLayoutData(m_data.uuid);
if (customLayoutData.has_value()) 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 else
{ {

4
src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
View File

@ -21,7 +21,7 @@ namespace FancyZonesUnitTests
{ {
.uuid = FancyZonesUtils::GuidFromString(L"{F762BAD6-DAA1-4997-9497-E11DFEB72F21}").value(), .uuid = FancyZonesUtils::GuidFromString(L"{F762BAD6-DAA1-4997-9497-E11DFEB72F21}").value(),
.type = ZoneSetLayoutType::Grid, .type = ZoneSetLayoutType::Grid,
.showSpacing = false, .showSpacing = true,
.spacing = 17, .spacing = 17,
.zoneCount = 4, .zoneCount = 4,
.sensitivityRadius = 33 .sensitivityRadius = 33
@ -192,7 +192,7 @@ namespace FancyZonesUnitTests
const LayoutData m_data{ const LayoutData m_data{
.uuid = FancyZonesUtils::GuidFromString(L"{33A2B101-06E0-437B-A61E-CDBECF502906}").value(), .uuid = FancyZonesUtils::GuidFromString(L"{33A2B101-06E0-437B-A61E-CDBECF502906}").value(),
.type = ZoneSetLayoutType::Grid, .type = ZoneSetLayoutType::Grid,
.showSpacing = false, .showSpacing = true,
.spacing = 17, .spacing = 17,
.zoneCount = 4, .zoneCount = 4,
.sensitivityRadius = 33 .sensitivityRadius = 33