mirror of
https://github.com/reactos/reactos.git
synced 2024-07-03 03:04:22 +00:00
[Win32k]
- Remove code that breaks API SetActiveWindow tests. See CORE-7447. - Dedicated to Victor Martinez Calvo. svn path=/trunk/; revision=64730
This commit is contained in:
parent
63dff05e61
commit
e9aecdf259
|
@ -1544,22 +1544,17 @@ WinPosFixupFlags(WINDOWPOS *WinPos, PWND Wnd)
|
|||
WinPos->flags |= SWP_NOMOVE;
|
||||
}
|
||||
|
||||
if (WinPos->hwnd == UserGetForegroundWindow())
|
||||
if (WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD)
|
||||
{
|
||||
WinPos->flags |= SWP_NOACTIVATE; /* Already active */
|
||||
}
|
||||
else
|
||||
if ((Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD)
|
||||
/* Bring to the top when activating */
|
||||
if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) &&
|
||||
(WinPos->flags & SWP_NOZORDER ||
|
||||
(WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter != HWND_NOTOPMOST)))
|
||||
{
|
||||
/* Bring to the top when activating */
|
||||
if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) &&
|
||||
(WinPos->flags & SWP_NOZORDER ||
|
||||
(WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter != HWND_NOTOPMOST)))
|
||||
{
|
||||
WinPos->flags &= ~SWP_NOZORDER;
|
||||
WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP);
|
||||
}
|
||||
WinPos->flags &= ~SWP_NOZORDER;
|
||||
WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP);
|
||||
}
|
||||
}
|
||||
|
||||
/* Check hwndInsertAfter */
|
||||
if (!(WinPos->flags & SWP_NOZORDER))
|
||||
|
|
Loading…
Reference in a new issue