mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 03:34:16 +00:00
[NtUser]
- Fix API SetActiveWindow test, get it back. svn path=/trunk/; revision=57113
This commit is contained in:
parent
06b23a2294
commit
fe0ec3d865
|
@ -591,13 +591,14 @@ co_IntSetActiveWindow(PWND Wnd OPTIONAL, HWND * Prev, BOOL bMouse, BOOL bFocus,
|
||||||
if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE))
|
if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE))
|
||||||
{
|
{
|
||||||
/* Do not change focus if the window is no longer active */
|
/* Do not change focus if the window is no longer active */
|
||||||
if ( !Wnd || IntGetNonChildAncestor(ThreadQueue->spwndFocus) != ThreadQueue->spwndActive)
|
if (ThreadQueue->spwndActive == Wnd)
|
||||||
{
|
{
|
||||||
PWND pWndTemp = Wnd;
|
if (!ThreadQueue->spwndFocus ||
|
||||||
if (ThreadQueue->spwndActive && ThreadQueue->spwndActive->style & WS_MINIMIZE)
|
!Wnd ||
|
||||||
pWndTemp = NULL;
|
UserGetAncestor(ThreadQueue->spwndFocus, GA_ROOT) != Wnd)
|
||||||
TRACE("SAW is setting Focus! 0x%p Temp 0x%p\n",Wnd, pWndTemp);
|
{
|
||||||
IntSendFocusMessages(pti, pWndTemp);
|
co_UserSetFocus(Wnd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue