maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #504 from TheMrJukes/master

Browse source 
Fix rcNormalPosition in SetWindowPlacement
This commit is contained in:
Bret 2019-10-16 09:54:08 -07:00 committed by GitHub
parent 41842048a3 03cb04823c
commit 6d3ce4e3cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/modules/fancyzones/lib/Zone.cpp
View file

@ -1,6 +1,5 @@
#include "pch.h"
struct Zone : winrt::implements<Zone, IZone>
{
public:
@ -75,6 +74,12 @@ void Zone::SizeWindowToZone(HWND window, HWND zoneWindow) noexcept
// Map to screen coords
MapWindowRect(zoneWindow, nullptr, &zoneRect);
MONITORINFO mi{sizeof(mi)};
if (GetMonitorInfoW(MonitorFromWindow(zoneWindow, MONITOR_DEFAULTTONEAREST), &mi))
{
OffsetRect(&zoneRect, mi.rcMonitor.left - mi.rcWork.left, mi.rcMonitor.top - mi.rcWork.top);
}
WINDOWPLACEMENT placement;
::GetWindowPlacement(window, &placement);
placement.rcNormalPosition = zoneRect;

4
src/modules/fancyzones/lib/ZoneSet.cpp
View file

@ -270,10 +270,6 @@ IFACEMETHODIMP_(void) ZoneSet::MoveSizeEnd(HWND window, HWND zoneWindow, POINT p
if (auto zone = ZoneFromPoint(ptClient))
{
zone->AddWindowToZone(window, zoneWindow, true);
POINT pointAdjustedScreen = ptClient;
MapWindowPoints(zoneWindow, nullptr, &pointAdjustedScreen, 1);
SetCursorPos(pointAdjustedScreen.x, pointAdjustedScreen.y);
}
}