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

Adjustments (#24254)

Browse Source
This commit is contained in:
Clint Rutkas
2023-02-22 14:55:25 -08:00
committed by GitHub
parent 995fd2ed50
commit d122f7ff99
11 changed files with 1458 additions and 1517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp
View File

@@ -37,8 +37,8 @@ namespace JsonUtils
for (uint32_t i = 0; i < size; ++i)
{
json::JsonObject zoneJson = zonesJson.GetObjectAt(i);
const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YID));
const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XAxisID));
const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YAxisID));
const int width = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::WidthID));
const int height = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::HeightID));
FancyZonesDataTypes::CanvasLayoutInfo::Rect zone{ x, y, width, height };

4
src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h
View File

@@ -30,8 +30,8 @@ namespace NonLocalizable
const static wchar_t* RefHeightID = L"ref-height";
const static wchar_t* RefWidthID = L"ref-width";
const static wchar_t* ZonesID = L"zones";
const static wchar_t* XID = L"X";
const static wchar_t* YID = L"Y";
const static wchar_t* XAxisID = L"X";
const static wchar_t* YAxisID = L"Y";
const static wchar_t* WidthID = L"width";
const static wchar_t* HeightID = L"height";

8
src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp
View File

@@ -32,16 +32,16 @@ namespace FancyZonesUnitTests
json::JsonArray zonesArray{};
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(0));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(1040));
zonesArray.Append(zone);
}
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(649));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(1140));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(649));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(780));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(391));
zonesArray.Append(zone);

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

@@ -65,8 +65,8 @@ namespace FancyZonesUnitTests
for (const auto& zoneRect : zones)
{
json::JsonObject zone{};
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(zoneRect.top));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(zoneRect.top));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(zoneRect.right - zoneRect.left));
zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(zoneRect.bottom - zoneRect.top));
zonesArray.Append(zone);