Changeset 7189 for trunk/src

Timestamp:

Oct 24, 2001, 1:21:18 PM (24 years ago)

Author:

sandervl

Message:

window tracking activation fixes

File:

• trunk/src/user32/wintrack.cpp (modified) (6 diffs)

trunk/src/user32/wintrack.cpp

@@ -22 +22 @@
 #include "win32wbase.h"
 #include "hook.h"
+#include "pmwindow.h"
 
 #define ON_LEFT_BORDER(hit) \
@@ -441 +442 @@
     DWORD     dwPoint = GetMessagePos ();
     BOOL DragFullWindows = FALSE;
+    BOOL fControl = FALSE;
     BOOL grab;
     int iWndsLocks;
@@ -454 +456 @@
 //    if (IsZoomed(hwnd) || !IsWindowVisible(hwnd) || (exstyle & WS_EX_MANAGED)) return;
     if (IsZoomed(hwnd) || !IsWindowVisible(hwnd)) return;
+
+    if(fOS2Look) {
+        fControl = GetAsyncKeyState(VK_CONTROL);
+        if(DragFullWindows && !fControl) {
+            //Bring window to top and activate it
+            SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        }
+    }
 
     if ((wParam & 0xfff0) == SC_MOVE)
@@ -645 +655 @@
                                       newRect.right - newRect.left,
                                       newRect.bottom - newRect.top,
-                                      ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
+                                      ((hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ) | 
+                                      ((fControl) ? (SWP_NOACTIVATE|SWP_NOZORDER) : 0));
 //                        WIN_RestoreWndsLock(iWndsLocks);
                     }
@@ -705 +716 @@
                               lastsizingRect.right - lastsizingRect.left,
                               lastsizingRect.bottom - lastsizingRect.top,
-                              ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
+                              ((hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ) | 
+                              ((fControl) ? (SWP_NOACTIVATE|SWP_NOZORDER) : 0));
         }
         else
         { /* restore previous size/position */
+            //SvL: TODO: should really restore z-order & activation here
             if(DragFullWindows)
                 SetWindowPos( hwnd, 0, origRect.left, origRect.top,
@@ -718 +731 @@
 //        WIN_RestoreWndsLock(iWndsLocks);
     }
+    else
+    if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) {
+        //if action wasn't cancelled, ctrl wasn't pressed and we didn't
+        //activate the window before (!DragFullWindows), then activate
+        //and bring it to the top now
+        if(!fControl && !DragFullWindows) {
+            //Bring window to top and activate it
+            SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        }
+    }
 
     if (IsIconic(hwnd))