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

Check spelling 0 0 21 (#22335)

Browse Source
This commit is contained in:
Josh Soref
2022-11-29 14:41:22 -05:00
committed by GitHub
parent ca8faf00c2
commit 150e7d40dd
37 changed files with 862 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
View File

@@ -435,7 +435,7 @@ void FancyZones::WindowCreated(HWND window) noexcept
{
// window is recreated after switching virtual desktop
// avoid moving already opened windows after switching vd
bool isMoved = FancyZonesWindowProperties::RetreiveMovedOnOpeningProperty(window);
bool isMoved = FancyZonesWindowProperties::RetrieveMovedOnOpeningProperty(window);
if (!isMoved)
{
FancyZonesWindowProperties::StampMovedOnOpeningProperty(window);

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

@@ -467,7 +467,7 @@ bool AppliedLayouts::ApplyDefaultLayout(const FancyZonesDataTypes::WorkAreaId& d
return false;
}
MonitorConfiguraionType type = MonitorConfiguraionType::Horizontal;
MonitorConfigurationType type = MonitorConfigurationType::Horizontal;
MONITORINFOEX monitorInfo;
monitorInfo.cbSize = sizeof(monitorInfo);
if (GetMonitorInfo(deviceId.monitorId.monitor, &monitorInfo))
@@ -476,7 +476,7 @@ bool AppliedLayouts::ApplyDefaultLayout(const FancyZonesDataTypes::WorkAreaId& d
LONG height = monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top;
if (height > width)
{
type = MonitorConfiguraionType::Vertical;
type = MonitorConfigurationType::Vertical;
}
}

18
src/modules/fancyzones/FancyZonesLib/FancyZonesData/DefaultLayouts.cpp
View File

@@ -9,23 +9,23 @@
namespace DefaultLayoutsJsonUtils
{
MonitorConfiguraionType TypeFromString(const std::wstring& data)
MonitorConfigurationType TypeFromString(const std::wstring& data)
{
if (data == L"vertical")
{
return MonitorConfiguraionType::Vertical;
return MonitorConfigurationType::Vertical;
}
return MonitorConfiguraionType::Horizontal;
return MonitorConfigurationType::Horizontal;
}
std::wstring TypeToString(MonitorConfiguraionType type)
std::wstring TypeToString(MonitorConfigurationType type)
{
switch (type)
{
case MonitorConfiguraionType::Horizontal:
case MonitorConfigurationType::Horizontal:
return L"horizontal";
case MonitorConfiguraionType::Vertical:
case MonitorConfigurationType::Vertical:
return L"vertical";
default:
return L"horizontal";
@@ -80,7 +80,7 @@ namespace DefaultLayoutsJsonUtils
struct DefaultLayoutJSON
{
MonitorConfiguraionType monitorConfigurationType{ MonitorConfiguraionType::Horizontal };
MonitorConfigurationType monitorConfigurationType{ MonitorConfigurationType::Horizontal };
LayoutData layout{};
static std::optional<DefaultLayoutJSON> FromJson(const json::JsonObject& json)
@@ -117,7 +117,7 @@ namespace DefaultLayoutsJsonUtils
{
if (auto obj = DefaultLayoutJSON::FromJson(layouts.GetObjectAt(i)); obj.has_value())
{
map[static_cast<MonitorConfiguraionType>(obj->monitorConfigurationType)] = std::move(obj->layout);
map[static_cast<MonitorConfigurationType>(obj->monitorConfigurationType)] = std::move(obj->layout);
}
}
@@ -163,7 +163,7 @@ void DefaultLayouts::LoadData()
}
}
LayoutData DefaultLayouts::GetDefaultLayout(MonitorConfiguraionType type) const noexcept
LayoutData DefaultLayouts::GetDefaultLayout(MonitorConfigurationType type) const noexcept
{
auto iter = m_layouts.find(type);
if (iter != m_layouts.end())

6
src/modules/fancyzones/FancyZonesLib/FancyZonesData/DefaultLayouts.h
View File

@@ -22,7 +22,7 @@ namespace NonLocalizable
}
}
enum class MonitorConfiguraionType
enum class MonitorConfigurationType
{
Horizontal = 0,
Vertical
@@ -31,7 +31,7 @@ enum class MonitorConfiguraionType
class DefaultLayouts
{
public:
using TDefaultLayoutsContainer = std::map<MonitorConfiguraionType, LayoutData>;
using TDefaultLayoutsContainer = std::map<MonitorConfigurationType, LayoutData>;
static DefaultLayouts& instance();
@@ -46,7 +46,7 @@ public:
void LoadData();
LayoutData GetDefaultLayout(MonitorConfiguraionType type = MonitorConfiguraionType::Horizontal) const noexcept;
LayoutData GetDefaultLayout(MonitorConfigurationType type = MonitorConfigurationType::Horizontal) const noexcept;
private:
DefaultLayouts();

2
src/modules/fancyzones/FancyZonesLib/FancyZonesWindowProperties.cpp
View File

@@ -88,7 +88,7 @@ void FancyZonesWindowProperties::StampMovedOnOpeningProperty(HWND window)
::SetPropW(window, ZonedWindowProperties::PropertyMovedOnOpening, (HANDLE)1);
}
bool FancyZonesWindowProperties::RetreiveMovedOnOpeningProperty(HWND window)
bool FancyZonesWindowProperties::RetrieveMovedOnOpeningProperty(HWND window)
{
HANDLE handle = ::GetProp(window, ZonedWindowProperties::PropertyMovedOnOpening);
return handle != nullptr;

2
src/modules/fancyzones/FancyZonesLib/FancyZonesWindowProperties.h
View File

@@ -23,7 +23,7 @@ namespace FancyZonesWindowProperties
ZoneIndexSet RetrieveZoneIndexProperty(HWND window);
void StampMovedOnOpeningProperty(HWND window);
bool RetreiveMovedOnOpeningProperty(HWND window);
bool RetrieveMovedOnOpeningProperty(HWND window);
std::optional<size_t> GetTabSortKeyWithinZone(HWND window);
void SetTabSortKeyWithinZone(HWND window, std::optional<size_t> tabSortKeyWithinZone);

4
src/modules/fancyzones/FancyZonesLib/trace.h
View File

@@ -19,8 +19,8 @@ public:
static void EditorLaunched(int value) noexcept;
static void Error(const DWORD errorCode, std::wstring errorMessage, std::wstring methodName) noexcept;
static void QuickLayoutSwitched(bool shortcutUsed) noexcept;
static void SnapNewWindowIntoZone(Layout* activeaLayout, LayoutAssignedWindows* layoutWindows) noexcept;
static void KeyboardSnapWindowToZone(Layout* activeaLayout, LayoutAssignedWindows* layoutWindows) noexcept;
static void SnapNewWindowIntoZone(Layout* activeLayout, LayoutAssignedWindows* layoutWindows) noexcept;
static void KeyboardSnapWindowToZone(Layout* activeLayout, LayoutAssignedWindows* layoutWindows) noexcept;
};
static void SettingsTelemetry(const Settings& settings) noexcept;

12
src/modules/fancyzones/FancyZonesTests/UnitTests/DefaultLayoutsTests.Spec.cpp
View File

@@ -63,7 +63,7 @@ namespace FancyZonesUnitTests
.uuid = FancyZonesUtils::GuidFromString(L"{ACE817FD-2C51-4E13-903A-84CAB86FD17C}").value(),
.type = FancyZonesDataTypes::ZoneSetLayoutType::Custom
};
Assert::IsTrue(horizontal == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Horizontal));
Assert::IsTrue(horizontal == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Horizontal));
LayoutData vertical{
.uuid = GUID_NULL,
@@ -73,7 +73,7 @@ namespace FancyZonesUnitTests
.zoneCount = 4,
.sensitivityRadius = 30
};
Assert::IsTrue(vertical == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Vertical));
Assert::IsTrue(vertical == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Vertical));
}
TEST_METHOD (DefaultLayoutsParseEmpty)
@@ -96,8 +96,8 @@ namespace FancyZonesUnitTests
.sensitivityRadius = DefaultValues::SensitivityRadius
};
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Horizontal));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Vertical));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Horizontal));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Vertical));
}
TEST_METHOD (DefaultLayoutsNoFile)
@@ -114,8 +114,8 @@ namespace FancyZonesUnitTests
.sensitivityRadius = DefaultValues::SensitivityRadius
};
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Horizontal));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfiguraionType::Vertical));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Horizontal));
Assert::IsTrue(priorityGrid == DefaultLayouts::instance().GetDefaultLayout(MonitorConfigurationType::Vertical));
}
};
}