mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 04:54:28 +00:00
comctl32: Don't touch the new child twice in PGM_SETCHILD.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
310eb883b7
commit
6926564677
|
@ -248,10 +248,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr)
|
|||
TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf,
|
||||
infoPtr->nWidth, infoPtr->nHeight,
|
||||
-nPos, 0);
|
||||
SetWindowPos(infoPtr->hwndChild, 0,
|
||||
SetWindowPos(infoPtr->hwndChild, HWND_TOP,
|
||||
-nPos, 0,
|
||||
infoPtr->nWidth, infoPtr->nHeight,
|
||||
SWP_NOZORDER);
|
||||
infoPtr->nWidth, infoPtr->nHeight, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -262,10 +261,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr)
|
|||
TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf,
|
||||
infoPtr->nWidth, infoPtr->nHeight,
|
||||
0, -nPos);
|
||||
SetWindowPos(infoPtr->hwndChild, 0,
|
||||
SetWindowPos(infoPtr->hwndChild, HWND_TOP,
|
||||
0, -nPos,
|
||||
infoPtr->nWidth, infoPtr->nHeight,
|
||||
SWP_NOZORDER);
|
||||
infoPtr->nWidth, infoPtr->nHeight, 0);
|
||||
}
|
||||
|
||||
InvalidateRect(infoPtr->hwndChild, NULL, TRUE);
|
||||
|
@ -481,11 +479,6 @@ PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild)
|
|||
SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0,
|
||||
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE);
|
||||
|
||||
/* position child within the page scroller */
|
||||
SetWindowPos(infoPtr->hwndChild, HWND_TOP,
|
||||
0,0,0,0,
|
||||
SWP_SHOWWINDOW | SWP_NOSIZE); /* native is 0 */
|
||||
|
||||
infoPtr->nPos = -1;
|
||||
PAGER_SetPos(infoPtr, 0, FALSE);
|
||||
}
|
||||
|
|
|
@ -283,7 +283,7 @@ static void test_pager(void)
|
|||
GetWindowRect(pager, &rect);
|
||||
ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100,
|
||||
"pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top);
|
||||
todo_wine ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n");
|
||||
ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n");
|
||||
|
||||
flush_sequences(sequences, NUM_MSG_SEQUENCES);
|
||||
SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd);
|
||||
|
|
Loading…
Reference in a new issue