diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 74c1f95a5b..24a5b0055a 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -766,6 +766,7 @@ GDISCALED generatesqlfromuserquery GETDISPINFO GETDLGCODE +GETDPISCALEDSIZE GETEMPTYMARKUP GETICON getline @@ -1130,6 +1131,7 @@ keyevent KEYEVENTF keynum keyof +keyhook keyparts keyremaps keystokes @@ -1412,6 +1414,7 @@ NCRBUTTONDOWN NCRBUTTONUP NDEBUG ndp +Nefario neq NESW netcore @@ -1851,6 +1854,7 @@ SAVEFAILED scancode scanled Scn +SCOOBE SCOPEID screenshot scrollable @@ -1917,6 +1921,7 @@ SHORTCUTMAXONEACTIONKEY SHORTCUTNOREPEATEDMODIFIER SHORTCUTONEACTIONKEY SHORTCUTSTARTWITHMODIFIER +Shortcutguide Shortcuttool shortdate SHORTPATH diff --git a/README.md b/README.md index a08ff7bc7f..72c49243a2 100644 --- a/README.md +++ b/README.md @@ -24,15 +24,15 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline ### Requirements -- Windows 10 v1903 (build 18362) or newer preferred, Windows 10 v1803 (build 17134) minimum. - - ⚠️ PowerToys minimum version of Windows 10 will be increased to v1903 starting with the 0.37 release +- Windows 10 v1903 (build 18362) or newer. + - ⚠️ PowerToys minimum version of Windows 10 is v1903 starting with the 0.37 release - Have [.NET Core 3.1.13 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-desktop-3.1.13-windows-x64-installer). The installer should handle this but we want to directly make people aware. ### Via GitHub with EXE [Recommended] #### Stable version -Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.35.0-x64.exe` to download the PowerToys installer. +Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.37.0-x64.exe` to download the PowerToys installer. This is our preferred method. @@ -74,73 +74,75 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/ Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on. -### 0.35 - March 2021 Update +### 0.37 - April 2021 Update -Our goals for the [v0.35 release cycle][github-release-link] were to add in new functionality to support quick swapping layouts for FancyZones, wrap up work for the DirectShow migration for Video Conference Mute so we can migrate into the main dev branch as well as fixing bugs. +Our goals for [v0.37 release cycle](https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F19) Video Conference Mute work so we can bring it into the stable branch, general bug fixes, moving Keyboard manager out, and removing the legacy settings app. -The 0.36 experimental release was released as well which includes Video Conference Mute. +The 0.36 experimental release was released this month as well which includes Video Conference Mute which is based off the 0.35 code base. Our [prioritized roadmap][roadmap] of features and utilities will dictate what the core team is focusing on for the near future. -#### Highlights from v0.35 Stable/0.36 Experimental +#### Highlights from v0.37 **General** -- PowerToys will start requiring Windows 10 v1903 or greater after 0.35.x release. The v1 settings, which supports older Windows versions, will be removed in 0.37. - - Note: We may be able to bring back support when we migrate to WinUI3 but as of now, we will be increasing the minimum version of Windows to 1903 or greater. -- Localization corrections -- Improved GitHub report bug template. -- Increased .NET Core to 3.1.13 -- Fixed installer 'run as user' regression -**Color Picker** -- UX adjustments to editor. Thanks [@niels9001](https://github.com/niels9001)! -- `Esc` can now be used to exit the editor. Thanks [@BenConstable9](https://github.com/BenConstable9)! +- PowerToys now requires Windows 10, version 1903 or higher +- FancyZones editor default launching key is Win+Shift+` + - Windows Terminal's new Quake mode will use Win+`. We feel this is a far better use of the keystroke. + - Current PowerToys users can update this in our settings in the FancyZone section. +- Removed our v1 HTML based settings system -**FancyZones** -- Added hotkeys and quick swap functionality for custom layouts! Users can now assign a hotkey in the editor and use it to quickly set a desktop's zones with `Ctrl + Win + Alt + NUMBER` key binding, or by pressing the hotkey while dragging a window. -- UX updates. Thanks [@niels9001](https://github.com/niels9001)! -- Fixed zone placement algorithm for when the Taskbar is vertical -- Bug fixes +## New Spec - Feedback please! -**PowerToys Run** -- Users can specify where to show the launcher window. Thanks [@addrum](https://github.com/addrum)! -- New plugin added to support opening previously used Visual Studio Code workspaces, remote machines (SSH or Codespaces), and containers! When enabled, use `{` to query for available workspaces. Thanks [@ricardosantos9521](https://github.com/ricardosantos9521)! Please note, this plugin is off by default. -- Shell history now saves the raw command instead of the resolved command. A command like `%appdata%` would now save in the Shell history as is instead of `C:\Users\YourUserName\AppData\Roaming`. Thanks [@mayitbeegh](https://github.com/mayitbeegh)! -- Better logging to try to track down some bugs -- Bug fixes +- What is new in PowerToys (SCOOBE) - [Pull Request](https://github.com/microsoft/PowerToys/pull/10978) -**Video Conference Mute (Experimental)** -- Tracking work remaining at issue [#7944](https://github.com/microsoft/PowerToys/issues/7944) -- Goal is to have 0.36 experimental release week of April 5th (Yes, we've stated this before, we know) +### FancyZones +- Editor UX bug fixes. Thanks [@niels9001](https://github.com/niels9001) +- Monitor resolution is added to the top to directly infer the boxes on top are your monitors +- Fix for editor crash when editing a custom layout -**Contributor workflow** -- Main project now has a vsconfig which will prompt you to install needed items versus having to use a script. This will aid in keeping you up-to-date when something changes. -- Updated spell checker. Thanks [@jsoref](https://github.com/jsoref)! +### PowerRename +- Option added for capitalization. +- Improved loading responsiveness with large sums of files. -#### Community contributions +### PowerToys Run +- Changed XAML to improve rendering. Thanks [@niels9001](https://github.com/niels9001) +- Disabled plugins are no longer loaded +- VS Code plugin workspaces showing up now. Thanks [@ricardosantos9521](https://github.com/ricardosantos9521) + +### Keyboard manager +- Now an independent exe. This now runs high priority in its own process. When your CPU is under load, this should allow the process to continue to be prioritized + +### Color Picker +- uses a centralized keyhook. This should improve activation +- Esc for closing will no longer bubble through. Thanks [@DoctorNefario](https://github.com/DoctorNefario) + +### Settings / Welcome to PowerToys +- Shortcuts will stand out more +- Few accessability bugs fixed. Thanks [@niels9001](https://github.com/niels9001) + +### Shortcut Guide +- Excluded apps for Shortcut Guide. Thanks [@davidegiacometti ](https://github.com/davidegiacometti) + +### Installer +- new arg for starting PT after silent install + +### Developer quality of life +- Ability to directly debug against Settings + +## Community contributions We'd like to directly mention (in alphabetical order) for their continued community support this month and helping directly make PowerToys a better piece of software. -[@Aaron-Junker](https://github.com/Aaron-Junker), -[@addrum](https://github.com/addrum), -[@BenConstable9](https://github.com/BenConstable9), -[@htcfreek](https://github.com/htcfreek), -[@Jay-o-Way](https://github.com/Jay-o-Way), -[@jsoref](https://github.com/jsoref), -[@mayitbeegh](https://github.com/mayitbeegh), -[@niels9001](https://github.com/niels9001), -[@pc-v2](https://github.com/pc-v2), -and -[@ricardosantos9521](https://github.com/ricardosantos9521) +[@Aaron-Junker](https://github.com/Aaron-Junker), [@addrum](https://github.com/addrum), [@davidegiacometti ](https://github.com/davidegiacometti), [@DoctorNefario](https://github.com/DoctorNefario), [@htcfreek](https://github.com/htcfreek), [@Jay-o-Way](https://github.com/Jay-o-Way), [@niels9001](https://github.com/niels9001), and [@ricardosantos9521](https://github.com/ricardosantos9521) -#### What is being planned for v0.37 - April 2021 +#### What is being planned for v0.39 - May 2021 -For [v0.37][github-next-release-work], we are planning to work on: +For [v0.39][github-next-release-work], we are planning to work on: - Stability and bug fixes -- Adding VCM to the stable release -- Removing v1 Settings / PT minimum version will become Windows 10 v1903 -- Post-update guidance prompt work +- Improving VCM +- Moving Shortcutguide out of the main exe ## PowerToys Community @@ -165,5 +167,5 @@ The application logs basic telemetry. Our Telemetry Data page (Coming Soon) has [usingPowerToys-docs-link]: https://docs.microsoft.com/windows/powertoys/ -[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F19 +[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aopen+is%3Aissue+project%3Amicrosoft%2FPowerToys%2F20 [github-prerelease-link]: https://github.com/microsoft/PowerToys/releases/tag/v0.36.0 diff --git a/src/common/Display/dpi_aware.cpp b/src/common/Display/dpi_aware.cpp index da3b0a66ba..169583316d 100644 --- a/src/common/Display/dpi_aware.cpp +++ b/src/common/Display/dpi_aware.cpp @@ -5,34 +5,43 @@ namespace DPIAware { - HRESULT GetScreenDPIForWindow(HWND hwnd, UINT& dpi_x, UINT& dpi_y) + HRESULT GetScreenDPIForMonitor(HMONITOR targetMonitor, UINT& dpi) { - auto monitor_handle = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - dpi_x = 0; - dpi_y = 0; - if (monitor_handle != nullptr) + if (targetMonitor != nullptr) { - return GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y); + UINT dummy = 0; + return GetDpiForMonitor(targetMonitor, MDT_EFFECTIVE_DPI, &dpi, &dummy); } else { + dpi = DPIAware::DEFAULT_DPI; return E_FAIL; } } - HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi_x, UINT& dpi_y) + HRESULT GetScreenDPIForWindow(HWND hwnd, UINT& dpi) { - auto monitor_handle = MonitorFromPoint(p, MONITOR_DEFAULTTONEAREST); - dpi_x = 0; - dpi_y = 0; - if (monitor_handle != nullptr) + auto targetMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + return GetScreenDPIForMonitor(targetMonitor, dpi); + } + + HRESULT GetScreenDPIForPoint(POINT point, UINT& dpi) + { + auto targetMonitor = MonitorFromPoint(point, MONITOR_DEFAULTTONEAREST); + return GetScreenDPIForMonitor(targetMonitor, dpi); + } + + HRESULT GetScreenDPIForCursor(UINT& dpi) + { + HMONITOR targetMonitor = nullptr; + POINT currentCursorPos{ 0 }; + + if (GetCursorPos(¤tCursorPos)) { - return GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y); - } - else - { - return E_FAIL; + targetMonitor = MonitorFromPoint(currentCursorPos, MONITOR_DEFAULTTOPRIMARY); } + + return GetScreenDPIForMonitor(targetMonitor, dpi); } void Convert(HMONITOR monitor_handle, int& width, int& height) @@ -51,6 +60,19 @@ namespace DPIAware } } + void ConvertByCursorPosition(int& width, int& height) + { + HMONITOR targetMonitor = nullptr; + POINT currentCursorPos{ 0 }; + + if (GetCursorPos(¤tCursorPos)) + { + targetMonitor = MonitorFromPoint(currentCursorPos, MONITOR_DEFAULTTOPRIMARY); + } + + Convert(targetMonitor, width, height); + } + void InverseConvert(HMONITOR monitor_handle, int& width, int& height) { if (monitor_handle == NULL) @@ -83,7 +105,7 @@ namespace DPIAware { if (AreDpiAwarenessContextsEqual(levels[i], system_returned_value)) { - return static_cast(i); + return static_cast(i); } } return AwarenessLevel::UNAWARE; diff --git a/src/common/Display/dpi_aware.h b/src/common/Display/dpi_aware.h index 093994153e..4853621fef 100644 --- a/src/common/Display/dpi_aware.h +++ b/src/common/Display/dpi_aware.h @@ -7,9 +7,12 @@ namespace DPIAware { constexpr inline int DEFAULT_DPI = 96; - HRESULT GetScreenDPIForWindow(HWND hwnd, UINT& dpi_x, UINT& dpi_y); - HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi_x, UINT& dpi_y); + HRESULT GetScreenDPIForMonitor(HMONITOR targetMonitor, UINT& dpi); + HRESULT GetScreenDPIForWindow(HWND hwnd, UINT& dpi); + HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi); + HRESULT GetScreenDPIForCursor(UINT& dpi); void Convert(HMONITOR monitor_handle, int& width, int& height); + void ConvertByCursorPosition(int& width, int& height); void InverseConvert(HMONITOR monitor_handle, int& width, int& height); void EnableDPIAwarenessForThisProcess(); diff --git a/src/modules/colorPicker/ColorPickerUI/loc/ko/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl b/src/modules/colorPicker/ColorPickerUI/loc/ko/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl index 84839c7347..8c0e30ed07 100644 --- a/src/modules/colorPicker/ColorPickerUI/loc/ko/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl +++ b/src/modules/colorPicker/ColorPickerUI/loc/ko/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl @@ -136,6 +136,15 @@ + + + + + + + + + @@ -163,6 +172,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/colorPicker/ColorPickerUI/loc/sv/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl b/src/modules/colorPicker/ColorPickerUI/loc/sv/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl index 98ccaeb05e..2988290449 100644 --- a/src/modules/colorPicker/ColorPickerUI/loc/sv/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl +++ b/src/modules/colorPicker/ColorPickerUI/loc/sv/src/modules/colorPicker/ColorPickerUI/Properties/Resources.resx.lcl @@ -136,6 +136,15 @@ + + + + + + + + + @@ -163,6 +172,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 477af2f215..87867d4234 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 4eb3890b1e..598ee6bd70 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index a354e20813..172c8a3ba5 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 50f44cd345..6120550dc1 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index c932898cb9..1f03af8d9e 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 3f551e0de1..383194462e 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index ad38f2648c..b3bbf33ced 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 43b3cfc3f4..40c19891b4 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 44ad08ea5d..a907194c20 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index cc4aab6b3f..b7596753d9 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 180a00f1ac..426135d863 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 0b14b5bb62..350d773d18 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index ea8473d7eb..f94bb138f7 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 3b4a0e920b..b047900382 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 1599e66c84..bee55bc13d 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index c3a4a5777d..83aa9b3d4a 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 9e0c906c00..afc2271014 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -205,12 +205,15 @@ - + - + - + + + + @@ -505,11 +508,38 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl index 9a8fb3e3a7..7c7c3cd948 100644 --- a/src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/cs/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl index 85ae1b6c11..5d550dbef3 100644 --- a/src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/de/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/es/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/es/src/modules/fancyzones/lib/Resources.resx.lcl index f24d81a517..3eb55b568f 100644 --- a/src/modules/fancyzones/lib/loc/es/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/es/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/fr/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/fr/src/modules/fancyzones/lib/Resources.resx.lcl index 2f5e8cc392..6d0c70cafc 100644 --- a/src/modules/fancyzones/lib/loc/fr/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/fr/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/hu/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/hu/src/modules/fancyzones/lib/Resources.resx.lcl index 1449f06ea5..a891523e1f 100644 --- a/src/modules/fancyzones/lib/loc/hu/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/hu/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl index a7c60dddaa..7111677bde 100644 --- a/src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/it/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl index f06645a5a4..46fe35c449 100644 --- a/src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/ja/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl index 6bd2b1066e..78b5a2d157 100644 --- a/src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/ko/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/nl/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/nl/src/modules/fancyzones/lib/Resources.resx.lcl index b0499d68c3..d832516ad5 100644 --- a/src/modules/fancyzones/lib/loc/nl/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/nl/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl index 28e2636c64..4e224ee2a0 100644 --- a/src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/pl/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/pt-BR/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/pt-BR/src/modules/fancyzones/lib/Resources.resx.lcl index 1ef96d5836..f480bdca7c 100644 --- a/src/modules/fancyzones/lib/loc/pt-BR/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/pt-BR/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/pt-PT/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/pt-PT/src/modules/fancyzones/lib/Resources.resx.lcl index 7eb8a4d7d2..66033a4f6c 100644 --- a/src/modules/fancyzones/lib/loc/pt-PT/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/pt-PT/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/ru/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/ru/src/modules/fancyzones/lib/Resources.resx.lcl index 8b11805390..447e0958a0 100644 --- a/src/modules/fancyzones/lib/loc/ru/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/ru/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl index e353e54ff7..6a781f8931 100644 --- a/src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/sv/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/tr/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/tr/src/modules/fancyzones/lib/Resources.resx.lcl index 1b95b84e21..7f1e322548 100644 --- a/src/modules/fancyzones/lib/loc/tr/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/tr/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl index 82fae5a660..2dcfeb939a 100644 --- a/src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/zh-Hans/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/fancyzones/lib/loc/zh-Hant/src/modules/fancyzones/lib/Resources.resx.lcl b/src/modules/fancyzones/lib/loc/zh-Hant/src/modules/fancyzones/lib/Resources.resx.lcl index 9bca94b996..8606e7247d 100644 --- a/src/modules/fancyzones/lib/loc/zh-Hant/src/modules/fancyzones/lib/Resources.resx.lcl +++ b/src/modules/fancyzones/lib/loc/zh-Hant/src/modules/fancyzones/lib/Resources.resx.lcl @@ -10,12 +10,15 @@ - + - + - + + + + diff --git a/src/modules/imageresizer/ui/loc/nl/src/modules/imageresizer/ui/Properties/Resources.resx.lcl b/src/modules/imageresizer/ui/loc/nl/src/modules/imageresizer/ui/Properties/Resources.resx.lcl index ab2306fb33..cd2220d48f 100644 --- a/src/modules/imageresizer/ui/loc/nl/src/modules/imageresizer/ui/Properties/Resources.resx.lcl +++ b/src/modules/imageresizer/ui/loc/nl/src/modules/imageresizer/ui/Properties/Resources.resx.lcl @@ -333,10 +333,13 @@ - + - + + + + @@ -682,7 +685,7 @@ - + @@ -691,7 +694,7 @@ - + @@ -709,7 +712,7 @@ - + @@ -727,7 +730,7 @@ - + @@ -736,12 +739,15 @@ - + - + - + + + + diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp index 3e40b68d41..ec285fccb8 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp @@ -23,6 +23,8 @@ using namespace winrt::Windows::Foundation; +static UINT g_currentDPI = DPIAware::DEFAULT_DPI; + LRESULT CALLBACK EditKeyboardWindowProc(HWND, UINT, WPARAM, LPARAM); // This Hwnd will be the window handler for the Xaml Island: A child window that contains Xaml. @@ -142,7 +144,9 @@ inline void CreateEditKeyboardWindowImpl(HINSTANCE hInst, KeyboardManagerState& // Calculate DPI dependent window size int windowWidth = KeyboardManagerConstants::DefaultEditKeyboardWindowWidth; int windowHeight = KeyboardManagerConstants::DefaultEditKeyboardWindowHeight; - DPIAware::Convert(nullptr, windowWidth, windowHeight); + + DPIAware::ConvertByCursorPosition(windowWidth, windowHeight); + DPIAware::GetScreenDPIForCursor(g_currentDPI); // Window Creation HWND _hWndEditKeyboardWindow = CreateWindow( @@ -384,47 +388,62 @@ void CreateEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan TerminateProcess(GetCurrentProcess(), 0); } -inline std::wstring getMessage(UINT messageCode) -{ - switch (messageCode) - { - case WM_SIZE: - return L"WM_SIZE"; - case WM_NCDESTROY: - return L"WM_NCDESTROY"; - default: - return L""; - } -} - LRESULT CALLBACK EditKeyboardWindowProc(HWND hWnd, UINT messageCode, WPARAM wParam, LPARAM lParam) { - RECT rcClient; - auto message = getMessage(messageCode); - if (message != L"") - { - Logger::trace(L"EditKeyboardWindowProc() messageCode={}", getMessage(messageCode)); - } - switch (messageCode) { // Resize the XAML window whenever the parent window is painted or resized case WM_PAINT: case WM_SIZE: { - GetClientRect(hWnd, &rcClient); - SetWindowPos(hWndXamlIslandEditKeyboardWindow, 0, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom, SWP_SHOWWINDOW); + RECT rect = { 0 }; + GetClientRect(hWnd, &rect); + SetWindowPos(hWndXamlIslandEditKeyboardWindow, 0, rect.left, rect.top, rect.right, rect.bottom, SWP_SHOWWINDOW); } break; // To avoid UI elements overlapping on making the window smaller enforce a minimum window size case WM_GETMINMAXINFO: { - LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam; + LPMINMAXINFO mmi = (LPMINMAXINFO)lParam; int minWidth = KeyboardManagerConstants::MinimumEditKeyboardWindowWidth; int minHeight = KeyboardManagerConstants::MinimumEditKeyboardWindowHeight; - DPIAware::Convert(nullptr, minWidth, minHeight); - lpMMI->ptMinTrackSize.x = minWidth; - lpMMI->ptMinTrackSize.y = minHeight; + DPIAware::Convert(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONULL), minWidth, minHeight); + mmi->ptMinTrackSize.x = minWidth; + mmi->ptMinTrackSize.y = minHeight; + } + break; + case WM_GETDPISCALEDSIZE: + { + UINT newDPI = static_cast(wParam); + SIZE* size = reinterpret_cast(lParam); + Logger::trace(L"WM_GETDPISCALEDSIZE: DPI {} size X {} Y {}", newDPI, size->cx, size->cy); + + float scalingFactor = static_cast(newDPI) / g_currentDPI; + Logger::trace(L"WM_GETDPISCALEDSIZE: scaling factor {}", scalingFactor); + + size->cx = static_cast(size->cx * scalingFactor); + size->cy = static_cast(size->cy * scalingFactor); + + return 1; + } + break; + case WM_DPICHANGED: + { + UINT newDPI = static_cast(LOWORD(wParam)); + g_currentDPI = newDPI; + + RECT* rect = reinterpret_cast(lParam); + SetWindowPos( + hWnd, + nullptr, + rect->left, + rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + SWP_NOZORDER | SWP_NOACTIVATE + ); + + Logger::trace(L"WM_DPICHANGED: new dpi {} rect {} {} ", newDPI, rect->right - rect->left, rect->bottom - rect->top); } break; default: diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp index c42f8d3870..5bc7551024 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp @@ -18,6 +18,8 @@ using namespace winrt::Windows::Foundation; +static UINT g_currentDPI = DPIAware::DEFAULT_DPI; + LRESULT CALLBACK EditShortcutsWindowProc(HWND, UINT, WPARAM, LPARAM); // This Hwnd will be the window handler for the Xaml Island: A child window that contains Xaml. @@ -95,7 +97,8 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KeyboardManagerState& // Calculate DPI dependent window size int windowWidth = KeyboardManagerConstants::DefaultEditShortcutsWindowWidth; int windowHeight = KeyboardManagerConstants::DefaultEditShortcutsWindowHeight; - DPIAware::Convert(nullptr, windowWidth, windowHeight); + DPIAware::ConvertByCursorPosition(windowWidth, windowHeight); + DPIAware::GetScreenDPIForCursor(g_currentDPI); // Window Creation HWND _hWndEditShortcutsWindow = CreateWindow( @@ -360,26 +363,60 @@ void CreateEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa LRESULT CALLBACK EditShortcutsWindowProc(HWND hWnd, UINT messageCode, WPARAM wParam, LPARAM lParam) { - RECT rcClient; switch (messageCode) { // Resize the XAML window whenever the parent window is painted or resized case WM_PAINT: case WM_SIZE: { - GetClientRect(hWnd, &rcClient); - SetWindowPos(hWndXamlIslandEditShortcutsWindow, 0, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom, SWP_SHOWWINDOW); + RECT rect = { 0 }; + GetClientRect(hWnd, &rect); + SetWindowPos(hWndXamlIslandEditShortcutsWindow, 0, rect.left, rect.top, rect.right, rect.bottom, SWP_SHOWWINDOW); } break; // To avoid UI elements overlapping on making the window smaller enforce a minimum window size case WM_GETMINMAXINFO: { - LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam; + LPMINMAXINFO mmi = (LPMINMAXINFO)lParam; int minWidth = KeyboardManagerConstants::MinimumEditShortcutsWindowWidth; int minHeight = KeyboardManagerConstants::MinimumEditShortcutsWindowHeight; - DPIAware::Convert(nullptr, minWidth, minHeight); - lpMMI->ptMinTrackSize.x = minWidth; - lpMMI->ptMinTrackSize.y = minHeight; + DPIAware::Convert(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONULL), minWidth, minHeight); + mmi->ptMinTrackSize.x = minWidth; + mmi->ptMinTrackSize.y = minHeight; + } + break; + case WM_GETDPISCALEDSIZE: + { + UINT newDPI = static_cast(wParam); + SIZE* size = reinterpret_cast(lParam); + Logger::trace(L"WM_GETDPISCALEDSIZE: DPI {} size X {} Y {}", newDPI, size->cx, size->cy); + + float scalingFactor = static_cast(newDPI) / g_currentDPI; + Logger::trace(L"WM_GETDPISCALEDSIZE: scaling factor {}", scalingFactor); + + size->cx = static_cast(size->cx * scalingFactor); + size->cy = static_cast(size->cy * scalingFactor); + + return 1; + } + break; + case WM_DPICHANGED: + { + UINT newDPI = static_cast(LOWORD(wParam)); + g_currentDPI = newDPI; + + RECT* rect = reinterpret_cast(lParam); + SetWindowPos( + hWnd, + nullptr, + rect->left, + rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + SWP_NOZORDER | SWP_NOACTIVATE + ); + + Logger::trace(L"WM_DPICHANGED: new dpi {} rect {} {} ", newDPI, rect->right - rect->left, rect->bottom - rect->top); } break; default: diff --git a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h index 9e925d7c3a..dfbd07f691 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h +++ b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h @@ -50,13 +50,22 @@ namespace KeyboardManagerConstants // Default window sizes inline const int DefaultEditKeyboardWindowWidth = 800; inline const int DefaultEditKeyboardWindowHeight = 600; - inline const int MinimumEditKeyboardWindowWidth = 500; - inline const int MinimumEditKeyboardWindowHeight = 450; + + // Increasing the min size can cause issues when moving the window between + // monitors with different DPI scaling factor + inline const int MinimumEditKeyboardWindowWidth = 200; + inline const int MinimumEditKeyboardWindowHeight = 200; + inline const int EditKeyboardTableMinWidth = 700; + inline const int DefaultEditShortcutsWindowWidth = 1050; inline const int DefaultEditShortcutsWindowHeight = 600; - inline const int MinimumEditShortcutsWindowWidth = 500; - inline const int MinimumEditShortcutsWindowHeight = 500; + + // Increasing the min size can cause issues when moving the window between + // monitors with different DPI scaling factor + inline const int MinimumEditShortcutsWindowWidth = 200; + inline const int MinimumEditShortcutsWindowHeight = 200; + inline const int EditShortcutsTableMinWidth = 1000; // Key Remap table constants diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ko/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ko/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index 04a0166778..2bf699c52f 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ko/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ko/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/nl/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/nl/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index d1d7315d40..e528b26138 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/nl/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/nl/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-BR/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-BR/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index b0a379b920..2eb062bcfe 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-BR/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-BR/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-PT/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-PT/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index 45326ee19d..f8bcae1089 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-PT/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/pt-PT/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ru/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ru/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index c7e493c270..587d8e5bbd 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ru/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/ru/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/zh-Hant/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/zh-Hant/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl index b839d9761b..33c7d2dc76 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/zh-Hant/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/loc/zh-Hant/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx.lcl @@ -1,5 +1,5 @@  - + @@ -12,56 +12,65 @@ + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - diff --git a/src/modules/powerrename/ui/PowerRenameUI.cpp b/src/modules/powerrename/ui/PowerRenameUI.cpp index 7f063b49f1..55964d8b90 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.cpp +++ b/src/modules/powerrename/ui/PowerRenameUI.cpp @@ -667,8 +667,7 @@ void CPowerRenameUI::_OnInitDlg() m_initialWidth = RECT_WIDTH(rc); m_initialHeight = RECT_HEIGHT(rc); - UINT dummy = 0; - DPIAware::GetScreenDPIForWindow(m_hwnd, m_initialDPI, dummy); + DPIAware::GetScreenDPIForWindow(m_hwnd, m_initialDPI); for (UINT u = 0; u < ARRAYSIZE(g_repositionMap); u++) { @@ -887,8 +886,8 @@ void CPowerRenameUI::_MoveControl(_In_ DWORD id, _In_ DWORD repositionFlags) int width = rcWindow.right - rcWindow.left; int height = rcWindow.bottom - rcWindow.top; - UINT currentDPI = 0, dummy; - DPIAware::GetScreenDPIForWindow(m_hwnd, currentDPI, dummy); + UINT currentDPI = 0; + DPIAware::GetScreenDPIForWindow(m_hwnd, currentDPI); float scale = (float)currentDPI / m_initialDPI; switch (id) diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/cs/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/cs/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 2312c8443d..4d7273bae8 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/cs/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/cs/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/de/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/de/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 58122dd887..420c7314b7 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/de/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/de/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/es/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/es/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 917812588f..d3d208d235 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/es/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/es/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/fr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/fr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 603346eadc..0c1ec36439 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/fr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/fr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/hu/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/hu/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 1e83df570a..f37f54f2f2 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/hu/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/hu/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/it/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/it/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index b48f92cb78..cf5068241a 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/it/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/it/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ja/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ja/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 9e9936c98a..458c2b4c0d 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ja/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ja/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ko/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ko/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index f456b0db73..6189ab960d 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ko/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ko/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/nl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/nl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index ec92c38577..065c8edb13 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/nl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/nl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index ec8c864091..a20b5233ae 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pl/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-BR/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-BR/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 6723cc0797..37dec81de2 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-BR/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-BR/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-PT/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-PT/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 3f9576d258..80c82ceccb 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-PT/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/pt-PT/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ru/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ru/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index e16ed866c2..7b3d1866b5 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ru/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/ru/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/sv/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/sv/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index aba328b938..7724c04c01 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/sv/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/sv/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/tr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/tr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index b2dd844c1b..03fe43d0f3 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/tr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/tr/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 3179c5847f..9f71675e3f 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -966,12 +966,12 @@ - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hant/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hant/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index adad5296c8..1f615a4744 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hant/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hant/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -754,7 +754,7 @@ - + @@ -966,12 +966,12 @@ - + - + @@ -1821,12 +1821,12 @@ - + - + - + @@ -2236,12 +2236,15 @@ - + - + - + + + +