Changeset 9265 for trunk/src

Timestamp:

Sep 19, 2002, 11:37:42 AM (23 years ago)

Author:

sandervl

Message:

PF: Put window on top of owner if owner is not in the foreground

File:

• trunk/src/user32/win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.339 2002-09-17 17:43:07 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.340 2002-09-19 09:37:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -825 +825 @@
 
         //set the window size and update the client
+        //@@PF Popup children of inactive windows can thus bring inactive window
+        //on top, this is not correct, popup windows can be on top only if their owner
+        //is in foreground, otherwise they are linked after owner. 
+        if (((dwStyle & (WS_CHILD|WS_POPUP)) == WS_POPUP) && getOwner() && (getOwner()->getWindowHandle() != GetForegroundWindow()))
+        {
+            hwndLinkAfter = getOwner()->getWindowHandle();
+        }
         SetWindowPos(hwndLinkAfter, tmpRect.left, tmpRect.top, tmpRect.right-tmpRect.left, tmpRect.bottom-tmpRect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);