Fix reverting of focus to owner windows.

svn path=/trunk/; revision=16749
2026-09-02 19:26:32 +00:00 · 2005-07-26 16:34:48 +00:00
parent 609a60c719
commit 2ce933f05b
1 changed files with 23 additions and 0 deletions
@@ -114,6 +114,29 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
    IntSetFocusMessageQueue(NULL);
    return;
  }
+  if ((Window->Style & WS_POPUP) && (Wnd = IntGetOwner(Window)))
+  {
+    for(;;)
+    {
+      Old = Wnd;
+      Wnd = IntGetParentObject(Wnd);
+      if(IntIsDesktopWindow(Wnd))
+      {
+        IntReleaseWindowObject(Wnd);
+        Wnd = Old;
+        break;
+      }
+      IntReleaseWindowObject(Old);
+    }
+
+    if (IntSetForegroundWindow(Wnd))
+    {
+      IntReleaseWindowObject(Wnd);
+      return;
+    }
+
+    IntReleaseWindowObject(Wnd);
+  }
  Wnd = Window;
  for(;;)
  {