ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WINPOS_WindowFromPoint should respect hrgnWnd.

This commit is contained in:
Huw D M Davies 2000-08-07 17:10:39 +00:00 committed by Alexandre Julliard
parent b9f350b517
commit b00c0124b9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
windows/winpos.c
View File

@ -438,6 +438,7 @@ INT16 WINPOS_WindowFromPoint( WND* wndScope, POINT16 pt, WND **ppWnd )
INT16 retvalue; INT16 retvalue;
POINT16 xy = pt; POINT16 xy = pt;
TRACE("scope %04x %d,%d\n", wndScope->hwndSelf, pt.x, pt.y);
*ppWnd = NULL; *ppWnd = NULL;
wndPtr = WIN_LockWndPtr(wndScope->child); wndPtr = WIN_LockWndPtr(wndScope->child);
@ -466,14 +467,18 @@ INT16 WINPOS_WindowFromPoint( WND* wndScope, POINT16 pt, WND **ppWnd )
/* is enabled (or it's a top-level window), then explore */ /* is enabled (or it's a top-level window), then explore */
/* its children. Otherwise, go to the next window. */ /* its children. Otherwise, go to the next window. */
if ((wndPtr->dwStyle & WS_VISIBLE) && if ((wndPtr->dwStyle & WS_VISIBLE) &&
(!(wndPtr->dwStyle & WS_DISABLED) || (!(wndPtr->dwStyle & WS_DISABLED) ||
((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)) && ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)) &&
(xy.x >= wndPtr->rectWindow.left) && (wndPtr->hrgnWnd ?
(xy.x < wndPtr->rectWindow.right) && PtInRegion(wndPtr->hrgnWnd, xy.x - wndPtr->rectWindow.left,
(xy.y >= wndPtr->rectWindow.top) && xy.y - wndPtr->rectWindow.top) :
(xy.y < wndPtr->rectWindow.bottom)) ((xy.x >= wndPtr->rectWindow.left) &&
(xy.x < wndPtr->rectWindow.right) &&
(xy.y >= wndPtr->rectWindow.top) &&
(xy.y < wndPtr->rectWindow.bottom))))
{ {
TRACE("%d,%d is inside %04x\n", xy.x, xy.y, wndPtr->hwndSelf);
*ppWnd = wndPtr; /* Got a suitable window */ *ppWnd = wndPtr; /* Got a suitable window */
/* If window is minimized or disabled, return at once */ /* If window is minimized or disabled, return at once */
@ -517,7 +522,7 @@ hittest:
{ {
retvalue = hittest; /* Found the window */ retvalue = hittest; /* Found the window */
goto end; goto end;
} }
} }
else else
{ {