Skip to content

W
wine-winehq
Commit 38a76ecb authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

user32: SetWindowPos() should check the final window position in screen coords…

user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE.
parent 847317d0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/user32/winpos.c
View file @ 38a76ecb
......@@ -1849,6 +1849,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos )
{
HWND parent;
RECT window_rect;
POINT pt;
WND *wndPtr = WIN_GetPtr( winpos->hwnd );
BOOL ret = TRUE;
......@@ -1880,12 +1881,15 @@ static BOOL fixup_flags( WINDOWPOS *winpos )
if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW;
}
WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL );
WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL );
if ((window_rect.right - window_rect.left == winpos->cx) &&
(window_rect.bottom - window_rect.top == winpos->cy))
winpos->flags |= SWP_NOSIZE; /* Already the right size */
if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y))
pt.x = winpos->x;
pt.y = winpos->y;
ClientToScreen( parent, &pt );
if ((window_rect.left == pt.x) && (window_rect.top == pt.y))
winpos->flags |= SWP_NOMOVE; /* Already the right position */
if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment