Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FancyZones] Prevent snapping to invalid zone (#28206)

Browse Source
This commit is contained in:
Seraphima Zykova
2023-08-29 19:59:02 +03:00
committed by GitHub
parent ebc181bced
commit 2305c8e754
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
View File

@@ -124,6 +124,14 @@ bool WorkArea::Snap(HWND window, const ZoneIndexSet& zones, bool updatePosition)
return false; return false;
} }
for (ZoneIndex zone : zones)
{
if (static_cast<size_t>(zone) >= m_layout->Zones().size())
{
return false;
}
}
m_layoutWindows.Assign(window, zones); m_layoutWindows.Assign(window, zones);
AppZoneHistory::instance().SetAppLastZones(window, m_uniqueId, m_layout->Id(), zones); AppZoneHistory::instance().SetAppLastZones(window, m_uniqueId, m_layout->Id(), zones);

22
src/modules/fancyzones/FancyZonesTests/UnitTests/WorkArea.Spec.cpp
View File

@@ -316,6 +316,28 @@ namespace FancyZonesUnitTests
Assert::IsTrue(expected == layoutWindows.GetZoneIndexSetFromWindow(window)); Assert::IsTrue(expected == layoutWindows.GetZoneIndexSetFromWindow(window));
} }
TEST_METHOD(SnapEmptyZones)
{
const auto workArea = WorkArea::Create(m_hInst, m_workAreaId, m_parentUniqueId, m_workAreaRect);
const auto window = Mocks::WindowCreate(m_hInst);
Assert::IsFalse(workArea->Snap(window, {}));
}
TEST_METHOD(SnapToIncorrectZone)
{
const auto workArea = WorkArea::Create(m_hInst, m_workAreaId, m_parentUniqueId, m_workAreaRect);
const auto window = Mocks::WindowCreate(m_hInst);
const ZoneIndexSet zones = { 10 };
Assert::IsFalse(workArea->Snap(window, zones));
const auto processPath = get_process_path(window);
const auto history = AppZoneHistory::instance().GetZoneHistory(processPath, m_workAreaId);
Assert::IsFalse(history.has_value());
}
TEST_METHOD (UnsnapPropertyTest) TEST_METHOD (UnsnapPropertyTest)
{ {
const auto workArea = WorkArea::Create(m_hInst, m_workAreaId, m_parentUniqueId, m_workAreaRect); const auto workArea = WorkArea::Create(m_hInst, m_workAreaId, m_parentUniqueId, m_workAreaRect);