Popup windows will be hidden when we minimize a main frame or shown

windows/nonclient.c

@@ -2729,14 +2729,20 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt )
 	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

@@ -1737,7 +1737,10 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
   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 @@ void EVENT_UnmapNotify( HWND hWnd, XUnmapEvent *event )
   {
       EndMenu();
       if( pWnd->dwStyle & WS_VISIBLE )
+      {
 	  pWnd->dwStyle |= WS_MINIMIZE;
+          ShowOwnedPopups(hWnd,FALSE);
+      }
   }
   WIN_ReleaseWndPtr(pWnd);
 }