Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FancyZones] Fix blank layout error (#26828)

Browse Source
This commit is contained in:
Seraphima Zykova
2023-06-26 16:14:14 +02:00
committed by GitHub
parent 1b9094ae2b
commit 397178deec
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/fancyzones/FancyZonesTests/UnitTests/JsonHelpers.Tests.cpp
View File

@@ -112,15 +112,15 @@ namespace FancyZonesUnitTests
TEST_METHOD (ZoneSetLayoutTypeToString)
{
std::map<int, std::wstring> expectedMap = {
std::make_pair(-2, L"TypeToString_ERROR"),
std::make_pair(-1, L"blank"),
std::make_pair(0, L"focus"),
std::make_pair(1, L"columns"),
std::make_pair(2, L"rows"),
std::make_pair(3, L"grid"),
std::make_pair(4, L"priority-grid"),
std::make_pair(5, L"custom"),
std::make_pair(6, L"TypeToString_ERROR"),
std::make_pair(-1, L"TypeToString_ERROR"),
std::make_pair(0, L"blank"),
std::make_pair(1, L"focus"),
std::make_pair(2, L"columns"),
std::make_pair(3, L"rows"),
std::make_pair(4, L"grid"),
std::make_pair(5, L"priority-grid"),
std::make_pair(6, L"custom"),
std::make_pair(7, L"TypeToString_ERROR"),
};
for (const auto& expected : expectedMap)

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

@@ -382,7 +382,7 @@ namespace FancyZonesUnitTests
TEST_METHOD (ZeroZoneCount)
{
for (int type = static_cast<int>(ZoneSetLayoutType::Focus); type < static_cast<int>(ZoneSetLayoutType::Custom); type++)
for (int type = static_cast<int>(ZoneSetLayoutType::Columns); type < static_cast<int>(ZoneSetLayoutType::Custom); type++)
{
LayoutData data = m_data;
data.type = static_cast<ZoneSetLayoutType>(type);
@@ -395,6 +395,32 @@ namespace FancyZonesUnitTests
Assert::IsFalse(result);
}
}
{
LayoutData data = m_data;
data.type = static_cast<ZoneSetLayoutType>(ZoneSetLayoutType::Blank);
data.zoneCount = 0;
auto layout = std::make_unique<Layout>(data);
for (const auto& rect : m_workAreaRects)
{
auto result = layout->Init(rect, Mocks::Monitor());
Assert::IsTrue(result);
}
}
{
LayoutData data = m_data;
data.type = static_cast<ZoneSetLayoutType>(ZoneSetLayoutType::Focus);
data.zoneCount = 0;
auto layout = std::make_unique<Layout>(data);
for (const auto& rect : m_workAreaRects)
{
auto result = layout->Init(rect, Mocks::Monitor());
Assert::IsTrue(result);
}
}
}
TEST_METHOD (BigZoneCount)