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

[FancyZones] Custom canvas layouts scaling (#3644)

Browse Source 
* Make canvas layout scaling sensitive

* Revert "Make canvas layout scaling sensitive"

This reverts commit 705dab7e36.

* Revert "Revert "Make canvas layout scaling sensitive""

This reverts commit b9dd27644c.

* Cleanup

* Minor refactoring

* Address PR comments
This commit is contained in:
stefansjfw
2020-05-29 09:38:29 +02:00
committed by GitHub
parent 3bb3c06456
commit ff328381af
15 changed files with 120 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/fancyzones/tests/UnitTests/JsonHelpers.Tests.cpp
View File

@@ -208,8 +208,8 @@ namespace FancyZonesUnitTests
TEST_METHOD (ToJson)
{
CanvasLayoutInfo info;
info.referenceWidth = 123;
info.referenceHeight = 321;
info.lastWorkAreaWidth = 123;
info.lastWorkAreaHeight = 321;
info.zones = { CanvasLayoutInfo::Rect{ 11, 22, 33, 44 }, CanvasLayoutInfo::Rect{ 55, 66, 77, 88 } };
auto actual = CanvasLayoutInfo::ToJson(info);
@@ -219,15 +219,15 @@ namespace FancyZonesUnitTests
TEST_METHOD (FromJson)
{
CanvasLayoutInfo expected;
expected.referenceWidth = 123;
expected.referenceHeight = 321;
expected.lastWorkAreaWidth = 123;
expected.lastWorkAreaHeight = 321;
expected.zones = { CanvasLayoutInfo::Rect{ 11, 22, 33, 44 }, CanvasLayoutInfo::Rect{ 55, 66, 77, 88 } };
auto actual = CanvasLayoutInfo::FromJson(m_json);
Assert::IsTrue(actual.has_value());
Assert::AreEqual(expected.referenceHeight, actual->referenceHeight);
Assert::AreEqual(expected.referenceWidth, actual->referenceWidth);
Assert::AreEqual(expected.lastWorkAreaHeight, actual->lastWorkAreaHeight);
Assert::AreEqual(expected.lastWorkAreaWidth, actual->lastWorkAreaWidth);
Assert::AreEqual(expected.zones.size(), actual->zones.size());
for (int i = 0; i < expected.zones.size(); i++)
{
@@ -596,8 +596,8 @@ namespace FancyZonesUnitTests
auto expectedGrid = std::get<CanvasLayoutInfo>(expected.data.info);
auto actualGrid = std::get<CanvasLayoutInfo>(actual->data.info);
Assert::AreEqual(expectedGrid.referenceWidth, actualGrid.referenceWidth);
Assert::AreEqual(expectedGrid.referenceHeight, actualGrid.referenceHeight);
Assert::AreEqual(expectedGrid.lastWorkAreaWidth, actualGrid.lastWorkAreaWidth);
Assert::AreEqual(expectedGrid.lastWorkAreaHeight, actualGrid.lastWorkAreaHeight);
}
TEST_METHOD (FromJsonGridInvalidUuid)
@@ -1397,8 +1397,8 @@ namespace FancyZonesUnitTests
{
auto expectedInfo = std::get<CanvasLayoutInfo>(expected->data.info);
auto actualInfo = std::get<CanvasLayoutInfo>(actual.info);
Assert::AreEqual(expectedInfo.referenceWidth, actualInfo.referenceWidth, L"canvas width");
Assert::AreEqual(expectedInfo.referenceHeight, actualInfo.referenceHeight, L"canvas height");
Assert::AreEqual(expectedInfo.lastWorkAreaWidth, actualInfo.lastWorkAreaWidth, L"canvas width");
Assert::AreEqual(expectedInfo.lastWorkAreaHeight, actualInfo.lastWorkAreaHeight, L"canvas height");
}
iter.MoveNext();