1
0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2025-02-25 22:38:10 +01:00

Win+X shows correctly on multi monitor setups

This commit is contained in:
Valentin Radu 2021-09-01 07:07:53 +03:00
parent 9074649c73
commit 557c74da28

View File

@ -913,6 +913,8 @@ DWORD ShowLauncherTipContextMenu(
POINT GetDefaultWinXPosition() POINT GetDefaultWinXPosition()
{ {
POINT point, ptCursor; POINT point, ptCursor;
point.x = 0;
point.y = 0;
GetCursorPos(&ptCursor); GetCursorPos(&ptCursor);
HMONITOR hMonitor = MonitorFromPoint(ptCursor, MONITOR_DEFAULTTOPRIMARY); HMONITOR hMonitor = MonitorFromPoint(ptCursor, MONITOR_DEFAULTTOPRIMARY);
MONITORINFO mi; MONITORINFO mi;
@ -924,33 +926,37 @@ POINT GetDefaultWinXPosition()
), ),
&mi &mi
); );
HWND hWnd = FindWindowEx( HWND hWnd = NULL;
NULL, do
NULL,
L"Shell_TrayWnd",
NULL
);
if (MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY) != hMonitor)
{ {
hWnd = FindWindowEx(
NULL,
NULL,
L"Shell_SecondaryTrayWnd",
NULL
);
while (hWnd)
{
if (MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY) == hMonitor)
{
break;
}
hWnd = FindWindowEx( hWnd = FindWindowEx(
NULL, NULL,
hWnd, hWnd,
L"Shell_SecondaryTrayWnd", L"Shell_SecondaryTrayWnd",
NULL NULL
); );
if (MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY) == hMonitor)
{
break;
} }
} while (hWnd);
if (!hWnd)
{
hWnd = FindWindowEx(
NULL,
NULL,
L"Shell_TrayWnd",
NULL
);
ptCursor.x = 0;
ptCursor.y = 0;
GetMonitorInfo(
MonitorFromPoint(
ptCursor,
MONITOR_DEFAULTTOPRIMARY
),
&mi
);
} }
if (hWnd) if (hWnd)
{ {