Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix interaction between topmost and owner/owned windows

Browse source 
svn path=/trunk/; revision=8948
This commit is contained in:
Gé van Geldorp 2004-04-01 23:16:21 +00:00
parent f2bb2f6dcb
commit 81361062a2
1 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winpos.c,v 1.106 2004/03/30 20:50:16 gvg Exp $ /* $Id: winpos.c,v 1.107 2004/04/01 23:16:21 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -612,15 +612,15 @@ WinPosDoOwnedPopups(HWND hWnd, HWND hWndInsertAfter)
HWND *List = NULL; HWND *List = NULL;
HWND Owner = NtUserGetWindow(hWnd, GW_OWNER); HWND Owner = NtUserGetWindow(hWnd, GW_OWNER);
LONG Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE); LONG Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE);
PWINDOW_OBJECT DesktopWindow; PWINDOW_OBJECT DesktopWindow, ChildObject;
int i; int i;
if ((Style & WS_POPUP) && Owner) if ((Style & WS_POPUP) && Owner)
{ {
/* Make sure this popup stays above the owner */ /* Make sure this popup stays above the owner */
HWND hWndLocalPrev = HWND_TOP; HWND hWndLocalPrev = HWND_TOPMOST;
if (hWndInsertAfter != HWND_TOP) if (hWndInsertAfter != HWND_TOPMOST)
{ {
DesktopWindow = IntGetWindowObject(IntGetDesktopWindow()); DesktopWindow = IntGetWindowObject(IntGetDesktopWindow());
List = IntWinListChildren(DesktopWindow); List = IntWinListChildren(DesktopWindow);
@ -630,6 +630,19 @@ WinPosDoOwnedPopups(HWND hWnd, HWND hWndInsertAfter)
for (i = 0; List[i]; i++) for (i = 0; List[i]; i++)
{ {
if (List[i] == Owner) break; if (List[i] == Owner) break;
if (HWND_TOP == hWndInsertAfter)
{
ChildObject = IntGetWindowObject(List[i]);
if (NULL != ChildObject)
{
if (0 == (ChildObject->ExStyle & WS_EX_TOPMOST))
{
IntReleaseWindowObject(ChildObject);
break;
}
IntReleaseWindowObject(ChildObject);
}
}
if (List[i] != hWnd) hWndLocalPrev = List[i]; if (List[i] != hWnd) hWndLocalPrev = List[i];
if (hWndLocalPrev == hWndInsertAfter) break; if (hWndLocalPrev == hWndInsertAfter) break;
} }
@ -961,7 +974,12 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
} }
if (InsertAfterWindow != NULL) if (InsertAfterWindow != NULL)
IntReleaseWindowObject(InsertAfterWindow); IntReleaseWindowObject(InsertAfterWindow);
if (HWND_TOPMOST == WinPos.hwndInsertAfter) if ((HWND_TOPMOST == WinPos.hwndInsertAfter)
|| (0 != (Window->ExStyle & WS_EX_TOPMOST)
&& NULL != Window->PrevSibling
&& 0 != (Window->PrevSibling->ExStyle & WS_EX_TOPMOST))
|| (NULL != Window->NextSibling
&& 0 != (Window->NextSibling->ExStyle & WS_EX_TOPMOST)))
{ {
Window->ExStyle |= WS_EX_TOPMOST; Window->ExStyle |= WS_EX_TOPMOST;
} }
@ -1334,8 +1352,9 @@ WinPosShowWindow(HWND Wnd, INT Cmd)
Swp |= SWP_NOACTIVATE | SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER;
} }
WinPosSetWindowPos(Window->Self, HWND_TOP, NewPos.left, NewPos.top, WinPosSetWindowPos(Window->Self, 0 != (Window->ExStyle & WS_EX_TOPMOST)
NewPos.right, NewPos.bottom, LOWORD(Swp)); ? HWND_TOPMOST : HWND_TOP,
NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, LOWORD(Swp));
if (Cmd == SW_HIDE) if (Cmd == SW_HIDE)
{ {