From ecb5d2ae1ca58710625c710ecb229fbd17c93d28 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 27 May 2020 10:55:46 -0400 Subject: [PATCH] Spelling: ... fancyzones (#3777) * spelling: defined * spelling: excluded * spelling: guid * spelling: highlight * spelling: original * spelling: nonexistent --- .../FancyZonesEditor/Models/Settings.cs | 2 +- src/modules/fancyzones/lib/FancyZones.cpp | 2 +- src/modules/fancyzones/lib/JsonHelpers.cpp | 4 +-- src/modules/fancyzones/lib/JsonHelpers.h | 2 +- src/modules/fancyzones/lib/Settings.cpp | 12 +++---- src/modules/fancyzones/lib/Settings.h | 2 +- .../fancyzones/lib/WindowMoveHandler.cpp | 6 ++-- src/modules/fancyzones/lib/ZoneSet.cpp | 8 ++--- src/modules/fancyzones/lib/ZoneWindow.cpp | 6 ++-- src/modules/fancyzones/lib/ZoneWindow.h | 2 +- src/modules/fancyzones/lib/fancyzones.rc | 2 +- src/modules/fancyzones/lib/resource.h | 2 +- src/modules/fancyzones/lib/trace.cpp | 2 +- src/modules/fancyzones/lib/util.h | 2 +- .../tests/UnitTests/FancyZones.Spec.cpp | 18 +++++------ .../UnitTests/FancyZonesSettings.Spec.cpp | 32 +++++++++---------- .../tests/UnitTests/JsonHelpers.Tests.cpp | 4 +-- .../tests/UnitTests/ZoneSet.Spec.cpp | 2 +- .../tests/UnitTests/ZoneWindow.Spec.cpp | 10 +++--- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs index d039877349..57e9c3c172 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/Settings.cs @@ -42,7 +42,7 @@ namespace FancyZonesEditor public const ushort _gridModelId = 0xFFFC; public const ushort _priorityGridModelId = 0xFFFB; public const ushort _blankCustomModelId = 0xFFFA; - public const ushort _lastPrefinedId = _blankCustomModelId; + public const ushort _lastDefinedId = _blankCustomModelId; // hard coded data for all the "Priority Grid" configurations that are unique to "Grid" private static readonly byte[][] _priorityData = new byte[][] diff --git a/src/modules/fancyzones/lib/FancyZones.cpp b/src/modules/fancyzones/lib/FancyZones.cpp index b0a5314505..6c91517a8e 100644 --- a/src/modules/fancyzones/lib/FancyZones.cpp +++ b/src/modules/fancyzones/lib/FancyZones.cpp @@ -146,7 +146,7 @@ public: GetZoneHighlightColor() noexcept { // Skip the leading # and convert to long - const auto color = m_settings->GetSettings()->zoneHightlightColor; + const auto color = m_settings->GetSettings()->zoneHighlightColor; const auto tmp = std::stol(color.substr(1), nullptr, 16); const auto nR = (tmp & 0xFF0000) >> 16; const auto nG = (tmp & 0xFF00) >> 8; diff --git a/src/modules/fancyzones/lib/JsonHelpers.cpp b/src/modules/fancyzones/lib/JsonHelpers.cpp index 03e6bb053d..60b20e6f95 100644 --- a/src/modules/fancyzones/lib/JsonHelpers.cpp +++ b/src/modules/fancyzones/lib/JsonHelpers.cpp @@ -261,10 +261,10 @@ namespace JSONHelpers return it != end(deviceInfoMap) ? std::optional{ it->second } : std::nullopt; } - std::optional FancyZonesData::FindCustomZoneSet(const std::wstring& guuid) const + std::optional FancyZonesData::FindCustomZoneSet(const std::wstring& guid) const { std::scoped_lock lock{ dataLock }; - auto it = customZoneSetsMap.find(guuid); + auto it = customZoneSetsMap.find(guid); return it != end(customZoneSetsMap) ? std::optional{ it->second } : std::nullopt; } diff --git a/src/modules/fancyzones/lib/JsonHelpers.h b/src/modules/fancyzones/lib/JsonHelpers.h index ebd02baa5f..50d8ce14be 100644 --- a/src/modules/fancyzones/lib/JsonHelpers.h +++ b/src/modules/fancyzones/lib/JsonHelpers.h @@ -186,7 +186,7 @@ namespace JSONHelpers std::optional FindDeviceInfo(const std::wstring& zoneWindowId) const; - std::optional FindCustomZoneSet(const std::wstring& guuid) const; + std::optional FindCustomZoneSet(const std::wstring& guid) const; inline const std::wstring GetActiveDeviceId() const { diff --git a/src/modules/fancyzones/lib/Settings.cpp b/src/modules/fancyzones/lib/Settings.cpp index b2db29943f..7fe2458065 100644 --- a/src/modules/fancyzones/lib/Settings.cpp +++ b/src/modules/fancyzones/lib/Settings.cpp @@ -53,7 +53,7 @@ private: const std::wstring m_zoneColorName = L"fancyzones_zoneColor"; const std::wstring m_zoneBorderColorName = L"fancyzones_zoneBorderColor"; - const std::wstring m_zoneHiglightName = L"fancyzones_zoneHighlightColor"; + const std::wstring m_zoneHighlightName = L"fancyzones_zoneHighlightColor"; const std::wstring m_editorHotkeyName = L"fancyzones_editor_hotkey"; const std::wstring m_excludedAppsName = L"fancyzones_excluded_apps"; const std::wstring m_zoneHighlightOpacity = L"fancyzones_highlight_opacity"; @@ -84,13 +84,13 @@ IFACEMETHODIMP_(bool) FancyZonesSettings::GetConfig(_Out_ PWSTR buffer, _Out_ in settings.add_bool_toggle(setting.name, setting.resourceId, *setting.value); } - settings.add_color_picker(m_zoneHiglightName, IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, m_settings.zoneHightlightColor); + settings.add_color_picker(m_zoneHighlightName, IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, m_settings.zoneHighlightColor); settings.add_color_picker(m_zoneColorName, IDS_SETTING_DESCRIPTION_ZONECOLOR, m_settings.zoneColor); settings.add_color_picker(m_zoneBorderColorName, IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR, m_settings.zoneBorderColor); settings.add_int_spinner(m_zoneHighlightOpacity, IDS_SETTINGS_HIGHLIGHT_OPACITY, m_settings.zoneHighlightOpacity, 0, 100, 1); - settings.add_multiline_string(m_excludedAppsName, IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION, m_settings.excludedApps); + settings.add_multiline_string(m_excludedAppsName, IDS_SETTING_EXCLUDED_APPS_DESCRIPTION, m_settings.excludedApps); return settings.serialize_to_buffer(buffer, buffer_size); } @@ -144,9 +144,9 @@ void FancyZonesSettings::LoadSettings(PCWSTR config, bool fromFile) noexcept try m_settings.zoneBorderColor = std::move(*val); } - if (auto val = values.get_string_value(m_zoneHiglightName)) + if (auto val = values.get_string_value(m_zoneHighlightName)) { - m_settings.zoneHightlightColor = std::move(*val); + m_settings.zoneHighlightColor = std::move(*val); } if (const auto val = values.get_json(m_editorHotkeyName)) @@ -195,7 +195,7 @@ void FancyZonesSettings::SaveSettings() noexcept try values.add_property(m_zoneColorName, m_settings.zoneColor); values.add_property(m_zoneBorderColorName, m_settings.zoneBorderColor); - values.add_property(m_zoneHiglightName, m_settings.zoneHightlightColor); + values.add_property(m_zoneHighlightName, m_settings.zoneHighlightColor); values.add_property(m_zoneHighlightOpacity, m_settings.zoneHighlightOpacity); values.add_property(m_editorHotkeyName, m_settings.editorHotkey.get_json()); values.add_property(m_excludedAppsName, m_settings.excludedApps); diff --git a/src/modules/fancyzones/lib/Settings.h b/src/modules/fancyzones/lib/Settings.h index f7d518730f..863c9494d4 100644 --- a/src/modules/fancyzones/lib/Settings.h +++ b/src/modules/fancyzones/lib/Settings.h @@ -19,7 +19,7 @@ struct Settings bool makeDraggedWindowTransparent = true; std::wstring zoneColor = L"#F5FCFF"; std::wstring zoneBorderColor = L"#FFFFFF"; - std::wstring zoneHightlightColor = L"#008CFF"; + std::wstring zoneHighlightColor = L"#008CFF"; int zoneHighlightOpacity = 50; PowerToysSettings::HotkeyObject editorHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, false, VK_OEM_3); std::wstring excludedApps = L""; diff --git a/src/modules/fancyzones/lib/WindowMoveHandler.cpp b/src/modules/fancyzones/lib/WindowMoveHandler.cpp index b17233da63..d5aadcb88e 100644 --- a/src/modules/fancyzones/lib/WindowMoveHandler.cpp +++ b/src/modules/fancyzones/lib/WindowMoveHandler.cpp @@ -166,7 +166,7 @@ void WindowMoveHandlerPrivate::MoveSizeStart(HWND window, HMONITOR monitor, POIN } else if (m_zoneWindowMoveSize) { - m_zoneWindowMoveSize->RestoreOrginalTransparency(); + m_zoneWindowMoveSize->RestoreOriginalTransparency(); m_zoneWindowMoveSize = nullptr; for (auto [keyMonitor, zoneWindow] : zoneWindowMap) { @@ -200,7 +200,7 @@ void WindowMoveHandlerPrivate::MoveSizeUpdate(HMONITOR monitor, POINT const& ptS { if (zoneWindow) { - zoneWindow->RestoreOrginalTransparency(); + zoneWindow->RestoreOriginalTransparency(); zoneWindow->HideZoneWindow(); } } @@ -213,7 +213,7 @@ void WindowMoveHandlerPrivate::MoveSizeUpdate(HMONITOR monitor, POINT const& ptS if (iter->second != m_zoneWindowMoveSize) { // The drag has moved to a different monitor. - m_zoneWindowMoveSize->RestoreOrginalTransparency(); + m_zoneWindowMoveSize->RestoreOriginalTransparency(); if (!m_settings->GetSettings()->showZonesOnAllMonitors) { diff --git a/src/modules/fancyzones/lib/ZoneSet.cpp b/src/modules/fancyzones/lib/ZoneSet.cpp index b771b26d4e..e0a2a8cbe7 100644 --- a/src/modules/fancyzones/lib/ZoneSet.cpp +++ b/src/modules/fancyzones/lib/ZoneSet.cpp @@ -575,12 +575,12 @@ bool ZoneSet::CalculateUniquePriorityGridLayout(Rect workArea, int zoneCount, in bool ZoneSet::CalculateCustomLayout(Rect workArea, int spacing) noexcept { - wil::unique_cotaskmem_string guuidStr; - if (SUCCEEDED_LOG(StringFromCLSID(m_config.Id, &guuidStr))) + wil::unique_cotaskmem_string guidStr; + if (SUCCEEDED_LOG(StringFromCLSID(m_config.Id, &guidStr))) { - const std::wstring guuid = guuidStr.get(); + const std::wstring guid = guidStr.get(); - const auto zoneSetSearchResult = JSONHelpers::FancyZonesDataInstance().FindCustomZoneSet(guuid); + const auto zoneSetSearchResult = JSONHelpers::FancyZonesDataInstance().FindCustomZoneSet(guid); if (!zoneSetSearchResult.has_value()) { diff --git a/src/modules/fancyzones/lib/ZoneWindow.cpp b/src/modules/fancyzones/lib/ZoneWindow.cpp index ec93b10d81..556637da51 100644 --- a/src/modules/fancyzones/lib/ZoneWindow.cpp +++ b/src/modules/fancyzones/lib/ZoneWindow.cpp @@ -210,7 +210,7 @@ public: IFACEMETHODIMP MoveSizeUpdate(POINT const& ptScreen, bool dragEnabled) noexcept; IFACEMETHODIMP MoveSizeEnd(HWND window, POINT const& ptScreen) noexcept; IFACEMETHODIMP_(void) - RestoreOrginalTransparency() noexcept; + RestoreOriginalTransparency() noexcept; IFACEMETHODIMP_(bool) IsDragEnabled() noexcept { return m_dragEnabled; } IFACEMETHODIMP_(void) @@ -402,7 +402,7 @@ IFACEMETHODIMP ZoneWindow::MoveSizeUpdate(POINT const& ptScreen, bool dragEnable IFACEMETHODIMP ZoneWindow::MoveSizeEnd(HWND window, POINT const& ptScreen) noexcept { - RestoreOrginalTransparency(); + RestoreOriginalTransparency(); if (m_windowMoveSize != window) { @@ -425,7 +425,7 @@ IFACEMETHODIMP ZoneWindow::MoveSizeEnd(HWND window, POINT const& ptScreen) noexc } IFACEMETHODIMP_(void) -ZoneWindow::RestoreOrginalTransparency() noexcept +ZoneWindow::RestoreOriginalTransparency() noexcept { if (m_host->isMakeDraggedWindowTransparentActive() && draggedWindow != nullptr) { diff --git a/src/modules/fancyzones/lib/ZoneWindow.h b/src/modules/fancyzones/lib/ZoneWindow.h index 297cfca0ad..ebe2a77d40 100644 --- a/src/modules/fancyzones/lib/ZoneWindow.h +++ b/src/modules/fancyzones/lib/ZoneWindow.h @@ -81,7 +81,7 @@ interface __declspec(uuid("{7F017528-8110-4FB3-BE41-F472969C2560}")) IZoneWindow /** * Restore original transaprency of dragged window. */ - IFACEMETHOD_(void, RestoreOrginalTransparency) () = 0; + IFACEMETHOD_(void, RestoreOriginalTransparency) () = 0; /** * Save information about zone in which window was assigned, when closing the window. * Used once we open same window again to assign it to its previous zone. diff --git a/src/modules/fancyzones/lib/fancyzones.rc b/src/modules/fancyzones/lib/fancyzones.rc index 00b0f2c91f..839a57b4a3 100644 --- a/src/modules/fancyzones/lib/fancyzones.rc +++ b/src/modules/fancyzones/lib/fancyzones.rc @@ -24,7 +24,7 @@ BEGIN IDS_SETTING_LAUNCH_EDITOR_BUTTON "Edit zones" IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION "To launch the zone editor, select the Edit zones button below or press the zone editor hotkey anytime" IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL "Configure the zone editor hotkey" - IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION "To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings." + IDS_SETTING_EXCLUDED_APPS_DESCRIPTION "To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings." IDS_SETTINGS_HIGHLIGHT_OPACITY "Zone opacity (%)" IDS_FANCYZONES L"FancyZones" IDS_CANT_DRAG_ELEVATED L"We've detected an application running with administrator privileges. This blocks some functionality in PowerToys. Visit our wiki page to learn more." diff --git a/src/modules/fancyzones/lib/resource.h b/src/modules/fancyzones/lib/resource.h index 11dee34949..8248448fb1 100644 --- a/src/modules/fancyzones/lib/resource.h +++ b/src/modules/fancyzones/lib/resource.h @@ -17,7 +17,7 @@ #define IDS_SETTING_LAUNCH_EDITOR_BUTTON 117 #define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 118 #define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL 119 -#define IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION 120 +#define IDS_SETTING_EXCLUDED_APPS_DESCRIPTION 120 #define IDS_SETTINGS_HIGHLIGHT_OPACITY 121 #define IDS_FANCYZONES 122 #define IDS_CANT_DRAG_ELEVATED 123 diff --git a/src/modules/fancyzones/lib/trace.cpp b/src/modules/fancyzones/lib/trace.cpp index aa70adbd2a..be505e97bf 100644 --- a/src/modules/fancyzones/lib/trace.cpp +++ b/src/modules/fancyzones/lib/trace.cpp @@ -189,7 +189,7 @@ void Trace::SettingsChanged(const Settings& settings) noexcept TraceLoggingBoolean(settings.makeDraggedWindowTransparent, "MakeDraggedWindowTransparent"), TraceLoggingWideString(settings.zoneColor.c_str(), "ZoneColor"), TraceLoggingWideString(settings.zoneBorderColor.c_str(), "ZoneBorderColor"), - TraceLoggingWideString(settings.zoneHightlightColor.c_str(), "ZoneHighlightColor"), + TraceLoggingWideString(settings.zoneHighlightColor.c_str(), "ZoneHighlightColor"), TraceLoggingInt32(settings.zoneHighlightOpacity, "ZoneHighlightOpacity"), TraceLoggingWideString(hotkeyStr.c_str(), "Hotkey"), TraceLoggingInt32(static_cast(settings.excludedAppsArray.size()), "ExcludedAppsCount")); diff --git a/src/modules/fancyzones/lib/util.h b/src/modules/fancyzones/lib/util.h index 9f465b2baf..c785c246e9 100644 --- a/src/modules/fancyzones/lib/util.h +++ b/src/modules/fancyzones/lib/util.h @@ -120,4 +120,4 @@ UINT GetDpiForMonitor(HMONITOR monitor) noexcept; void OrderMonitors(std::vector>& monitorInfo); void SizeWindowToRect(HWND window, RECT rect) noexcept; -bool IsInterestingWindow(HWND window, const std::vector& exludedApps) noexcept; \ No newline at end of file +bool IsInterestingWindow(HWND window, const std::vector& excludedApps) noexcept; \ No newline at end of file diff --git a/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp index ee0d41a0b0..8c6103998e 100644 --- a/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/FancyZones.Spec.cpp @@ -74,8 +74,8 @@ namespace FancyZonesUnitTests ptSettings.add_int_spinner(L"fancyzones_highlight_opacity", IDS_SETTINGS_HIGHLIGHT_OPACITY, settings.zoneHighlightOpacity, 0, 100, 1); ptSettings.add_color_picker(L"fancyzones_zoneColor", IDS_SETTING_DESCRIPTION_ZONECOLOR, settings.zoneColor); ptSettings.add_color_picker(L"fancyzones_zoneBorderColor", IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR, settings.zoneBorderColor); - ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHightlightColor); - ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION, settings.excludedApps); + ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHighlightColor); + ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLUDED_APPS_DESCRIPTION, settings.excludedApps); return ptSettings.serialize(); } @@ -116,7 +116,7 @@ namespace FancyZonesUnitTests .use_cursorpos_editor_startupscreen = true, .zoneColor = L"#abafee", .zoneBorderColor = L"FAFAFA", - .zoneHightlightColor = L"#FAFAFA", + .zoneHighlightColor = L"#FAFAFA", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", @@ -145,7 +145,7 @@ namespace FancyZonesUnitTests .use_cursorpos_editor_startupscreen = true, .zoneColor = L"#FAFAFA", .zoneBorderColor = L"#abafee", - .zoneHightlightColor = L"#FAFAFA", + .zoneHighlightColor = L"#FAFAFA", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", @@ -176,7 +176,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = true, .zoneColor = L"#FAFAFA", .zoneBorderColor = L"FAFAFA", - .zoneHightlightColor = L"#abafee", + .zoneHighlightColor = L"#abafee", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", @@ -207,7 +207,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = true, .zoneColor = L"#FAFAFA", .zoneBorderColor = L"FAFAFA", - .zoneHightlightColor = L"#abafee", + .zoneHighlightColor = L"#abafee", .zoneHighlightOpacity = expected, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", @@ -238,7 +238,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = true, .zoneColor = L"#FAFAFA", .zoneBorderColor = L"FAFAFA", - .zoneHightlightColor = L"#abafee", + .zoneHighlightColor = L"#abafee", .zoneHighlightOpacity = expected, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", @@ -292,8 +292,8 @@ namespace FancyZonesUnitTests ptSettings.add_int_spinner(L"fancyzones_highlight_opacity", IDS_SETTINGS_HIGHLIGHT_OPACITY, settings.zoneHighlightOpacity, 0, 100, 1); ptSettings.add_color_picker(L"fancyzones_zoneColor", IDS_SETTING_DESCRIPTION_ZONECOLOR, settings.zoneColor); ptSettings.add_color_picker(L"fancyzones_zoneBorderColor", IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR, settings.zoneBorderColor); - ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHightlightColor); - ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION, settings.excludedApps); + ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHighlightColor); + ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLUDED_APPS_DESCRIPTION, settings.excludedApps); return ptSettings.serialize(); } diff --git a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp index 5d51949ce6..d59ad343ad 100644 --- a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp @@ -39,7 +39,7 @@ namespace FancyZonesUnitTests Assert::AreEqual(expected.makeDraggedWindowTransparent, actual.makeDraggedWindowTransparent); Assert::AreEqual(expected.zoneColor.c_str(), actual.zoneColor.c_str()); Assert::AreEqual(expected.zoneBorderColor.c_str(), actual.zoneBorderColor.c_str()); - Assert::AreEqual(expected.zoneHightlightColor.c_str(), actual.zoneHightlightColor.c_str()); + Assert::AreEqual(expected.zoneHighlightColor.c_str(), actual.zoneHighlightColor.c_str()); Assert::AreEqual(expected.zoneHighlightOpacity, actual.zoneHighlightOpacity); Assert::AreEqual(expected.excludedApps.c_str(), actual.excludedApps.c_str()); Assert::AreEqual(expected.excludedAppsArray.size(), actual.excludedAppsArray.size()); @@ -117,7 +117,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -153,7 +153,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -183,7 +183,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = m_defaultSettings.makeDraggedWindowTransparent, .zoneColor = L"FAFAFA", .zoneBorderColor = L"CCDDEE", - .zoneHightlightColor = L"#00FFD7", + .zoneHighlightColor = L"#00FFD7", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, true, true, false, VK_OEM_3), .excludedApps = L"app", @@ -193,7 +193,7 @@ namespace FancyZonesUnitTests PowerToysSettings::PowerToyValues values(m_moduleName); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -255,7 +255,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_show_on_all_monitors", expected.showZonesOnAllMonitors); values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -287,7 +287,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -319,7 +319,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); @@ -432,7 +432,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = true, .zoneColor = L"FAFAFA", .zoneBorderColor = L"CCDDEE", - .zoneHightlightColor = L"#00FFD7", + .zoneHighlightColor = L"#00FFD7", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, true, true, false, VK_OEM_3), .excludedApps = L"app", @@ -453,7 +453,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_makeDraggedWindowTransparent", expected.makeDraggedWindowTransparent); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); values.add_property(L"fancyzones_editor_hotkey", expected.editorHotkey.get_json()); values.add_property(L"fancyzones_excluded_apps", expected.excludedApps); @@ -571,8 +571,8 @@ namespace FancyZonesUnitTests ptSettings.add_int_spinner(L"fancyzones_highlight_opacity", IDS_SETTINGS_HIGHLIGHT_OPACITY, settings.zoneHighlightOpacity, 0, 100, 1); ptSettings.add_color_picker(L"fancyzones_zoneColor", IDS_SETTING_DESCRIPTION_ZONECOLOR, settings.zoneColor); ptSettings.add_color_picker(L"fancyzones_zoneBorderColor", IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR, settings.zoneBorderColor); - ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHightlightColor); - ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION, settings.excludedApps); + ptSettings.add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, settings.zoneHighlightColor); + ptSettings.add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLUDED_APPS_DESCRIPTION, settings.excludedApps); return ptSettings.serialize(); } @@ -595,7 +595,7 @@ namespace FancyZonesUnitTests values.add_property(L"fancyzones_appLastZone_moveWindows", expected.appLastZone_moveWindows); values.add_property(L"use_cursorpos_editor_startupscreen", expected.use_cursorpos_editor_startupscreen); values.add_property(L"fancyzones_show_on_all_monitors", expected.showZonesOnAllMonitors); - values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHightlightColor); + values.add_property(L"fancyzones_zoneHighlightColor", expected.zoneHighlightColor); values.add_property(L"fancyzones_zoneColor", expected.zoneColor); values.add_property(L"fancyzones_zoneBorderColor", expected.zoneBorderColor); values.add_property(L"fancyzones_highlight_opacity", expected.zoneHighlightOpacity); @@ -631,11 +631,11 @@ namespace FancyZonesUnitTests m_ptSettings->add_bool_toggle(L"use_cursorpos_editor_startupscreen", IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN, expected.use_cursorpos_editor_startupscreen); m_ptSettings->add_bool_toggle(L"fancyzones_show_on_all_monitors", IDS_SETTING_DESCRIPTION_SHOW_FANCY_ZONES_ON_ALL_MONITORS, expected.showZonesOnAllMonitors); m_ptSettings->add_bool_toggle(L"fancyzones_makeDraggedWindowTransparent", IDS_SETTING_DESCRIPTION_MAKE_DRAGGED_WINDOW_TRANSPARENT, expected.makeDraggedWindowTransparent); - m_ptSettings->add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, expected.zoneHightlightColor); + m_ptSettings->add_color_picker(L"fancyzones_zoneHighlightColor", IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR, expected.zoneHighlightColor); m_ptSettings->add_color_picker(L"fancyzones_zoneColor", IDS_SETTING_DESCRIPTION_ZONECOLOR, expected.zoneColor); m_ptSettings->add_color_picker(L"fancyzones_zoneBorderColor", IDS_SETTING_DESCRIPTION_ZONE_BORDER_COLOR, expected.zoneBorderColor); m_ptSettings->add_int_spinner(L"fancyzones_highlight_opacity", IDS_SETTINGS_HIGHLIGHT_OPACITY, expected.zoneHighlightOpacity, 0, 100, 1); - m_ptSettings->add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION, expected.excludedApps); + m_ptSettings->add_multiline_string(L"fancyzones_excluded_apps", IDS_SETTING_EXCLUDED_APPS_DESCRIPTION, expected.excludedApps); } TEST_METHOD_CLEANUP(Cleanup) @@ -702,7 +702,7 @@ namespace FancyZonesUnitTests .makeDraggedWindowTransparent = true, .zoneColor = L"#FAFAFA", .zoneBorderColor = L"CCDDEE", - .zoneHightlightColor = L"#00AABB", + .zoneHighlightColor = L"#00AABB", .zoneHighlightOpacity = 45, .editorHotkey = PowerToysSettings::HotkeyObject::from_settings(false, false, false, false, VK_OEM_3), .excludedApps = L"app\r\napp2", diff --git a/src/modules/fancyzones/tests/UnitTests/JsonHelpers.Tests.cpp b/src/modules/fancyzones/tests/UnitTests/JsonHelpers.Tests.cpp index e759bce935..4c7326ff44 100644 --- a/src/modules/fancyzones/tests/UnitTests/JsonHelpers.Tests.cpp +++ b/src/modules/fancyzones/tests/UnitTests/JsonHelpers.Tests.cpp @@ -1117,7 +1117,7 @@ namespace FancyZonesUnitTests Assert::AreEqual(expected.data.activeZoneSet.uuid.c_str(), actual.activeZoneSet.uuid.c_str()); } - TEST_METHOD (DeviceInfoReadTempUnexsisted) + TEST_METHOD (DeviceInfoReadTempNonexistent) { FancyZonesData data; const std::wstring path = data.GetPersistFancyZonesJSONPath() + L".test_tmp"; @@ -1500,7 +1500,7 @@ namespace FancyZonesUnitTests Assert::AreEqual(expectedGrid.columns(), actualGrid.columns()); } - TEST_METHOD (CustomZoneSetsReadTempUnexsisted) + TEST_METHOD (CustomZoneSetsReadTempNonexistent) { const std::wstring path = m_fzData.GetPersistFancyZonesJSONPath() + L".test_tmp"; const std::wstring deviceId = L"default_device_id"; diff --git a/src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp index fcd706c95c..796fe8f99e 100644 --- a/src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp @@ -948,7 +948,7 @@ namespace FancyZonesUnitTests } } - TEST_METHOD (CustomZonesFromUnexistedFile) + TEST_METHOD (CustomZonesFromNonexistentFile) { const int spacing = 10; const int zoneCount = 0; diff --git a/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp index 8075bdff98..48f285b756 100644 --- a/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp @@ -724,10 +724,10 @@ namespace FancyZonesUnitTests auto window = Mocks::WindowCreate(m_hInst); - int orginalWidth = 450; - int orginalHeight = 550; + int originalWidth = 450; + int originalHeight = 550; - SetWindowPos(window, nullptr, 150, 150, orginalWidth, orginalHeight, SWP_SHOWWINDOW); + SetWindowPos(window, nullptr, 150, 150, originalWidth, originalHeight, SWP_SHOWWINDOW); SetWindowLong(window, GWL_STYLE, GetWindowLong(window, GWL_STYLE) & ~WS_SIZEBOX); auto zone = MakeZone(RECT{ 50, 50, 300, 300 }); @@ -737,8 +737,8 @@ namespace FancyZonesUnitTests RECT inZoneRect; GetWindowRect(window, &inZoneRect); - Assert::AreEqual(orginalWidth, (int)inZoneRect.right - (int) inZoneRect.left); - Assert::AreEqual(orginalHeight, (int)inZoneRect.bottom - (int)inZoneRect.top); + Assert::AreEqual(originalWidth, (int)inZoneRect.right - (int) inZoneRect.left); + Assert::AreEqual(originalHeight, (int)inZoneRect.bottom - (int)inZoneRect.top); } }; }