commit d1a1f7d6f76b75df33d967bd96b817c1ffd38ce7
author Noomen Hamza <noomen@macadamian.com> Sun Oct 24 00:02:27 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Oct 24 00:02:27 1999 +0000
tree 23febbbe4b3d176fb13b68d13d618f8b49ce983f
parent 6966c65b8775a63a03cdfc8e978657fbdbe6ddd2

Popup windows will be hidden when we minimize a main frame or shown
when we maximize or restore a minimized main frame.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index 0563c59..3788e47 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -2729,14 +2729,20 @@
 	break;
 
     case SC_MINIMIZE:
+        if (hwnd == GetForegroundWindow())
+            ShowOwnedPopups(hwnd,FALSE);
 	ShowWindow( hwnd, SW_MINIMIZE ); 
 	break;
 
     case SC_MAXIMIZE:
+        if (IsIconic(hwnd) && hwnd == GetForegroundWindow())
+            ShowOwnedPopups(hwnd,TRUE);
 	ShowWindow( hwnd, SW_MAXIMIZE );
 	break;
 
     case SC_RESTORE:
+        if (IsIconic(hwnd) && hwnd == GetForegroundWindow())
+            ShowOwnedPopups(hwnd,TRUE);
 	ShowWindow( hwnd, SW_RESTORE );
 	break;
 

windows/x11drv/event.c

diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 2be0c05..867831d 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -1737,7 +1737,10 @@
   WND *wndFocus = WIN_FindWndPtr(hwndFocus);
   WND *pWnd = WIN_FindWndPtr(hWnd);
   if (pWnd->flags & WIN_MANAGED)
+  {
       pWnd->dwStyle &= ~WS_MINIMIZE;
+      ShowOwnedPopups(hWnd,TRUE);
+  }
   WIN_ReleaseWndPtr(pWnd);
 
   if (hwndFocus && IsChild( hWnd, hwndFocus ))
@@ -1759,7 +1762,10 @@
   {
       EndMenu();
       if( pWnd->dwStyle & WS_VISIBLE )
+      {
 	  pWnd->dwStyle |= WS_MINIMIZE;
+          ShowOwnedPopups(hWnd,FALSE);
+      }
   }
   WIN_ReleaseWndPtr(pWnd);
 }