Popup windows will be hidden when we minimize a main frame or shown
when we maximize or restore a minimized main frame.
This commit is contained in:
parent
6966c65b87
commit
d1a1f7d6f7
|
@ -2729,14 +2729,20 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SC_MINIMIZE:
|
case SC_MINIMIZE:
|
||||||
|
if (hwnd == GetForegroundWindow())
|
||||||
|
ShowOwnedPopups(hwnd,FALSE);
|
||||||
ShowWindow( hwnd, SW_MINIMIZE );
|
ShowWindow( hwnd, SW_MINIMIZE );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SC_MAXIMIZE:
|
case SC_MAXIMIZE:
|
||||||
|
if (IsIconic(hwnd) && hwnd == GetForegroundWindow())
|
||||||
|
ShowOwnedPopups(hwnd,TRUE);
|
||||||
ShowWindow( hwnd, SW_MAXIMIZE );
|
ShowWindow( hwnd, SW_MAXIMIZE );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SC_RESTORE:
|
case SC_RESTORE:
|
||||||
|
if (IsIconic(hwnd) && hwnd == GetForegroundWindow())
|
||||||
|
ShowOwnedPopups(hwnd,TRUE);
|
||||||
ShowWindow( hwnd, SW_RESTORE );
|
ShowWindow( hwnd, SW_RESTORE );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -1737,7 +1737,10 @@ void EVENT_MapNotify( HWND hWnd, XMapEvent *event )
|
||||||
WND *wndFocus = WIN_FindWndPtr(hwndFocus);
|
WND *wndFocus = WIN_FindWndPtr(hwndFocus);
|
||||||
WND *pWnd = WIN_FindWndPtr(hWnd);
|
WND *pWnd = WIN_FindWndPtr(hWnd);
|
||||||
if (pWnd->flags & WIN_MANAGED)
|
if (pWnd->flags & WIN_MANAGED)
|
||||||
|
{
|
||||||
pWnd->dwStyle &= ~WS_MINIMIZE;
|
pWnd->dwStyle &= ~WS_MINIMIZE;
|
||||||
|
ShowOwnedPopups(hWnd,TRUE);
|
||||||
|
}
|
||||||
WIN_ReleaseWndPtr(pWnd);
|
WIN_ReleaseWndPtr(pWnd);
|
||||||
|
|
||||||
if (hwndFocus && IsChild( hWnd, hwndFocus ))
|
if (hwndFocus && IsChild( hWnd, hwndFocus ))
|
||||||
|
@ -1759,7 +1762,10 @@ void EVENT_UnmapNotify( HWND hWnd, XUnmapEvent *event )
|
||||||
{
|
{
|
||||||
EndMenu();
|
EndMenu();
|
||||||
if( pWnd->dwStyle & WS_VISIBLE )
|
if( pWnd->dwStyle & WS_VISIBLE )
|
||||||
|
{
|
||||||
pWnd->dwStyle |= WS_MINIMIZE;
|
pWnd->dwStyle |= WS_MINIMIZE;
|
||||||
|
ShowOwnedPopups(hWnd,FALSE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
WIN_ReleaseWndPtr(pWnd);
|
WIN_ReleaseWndPtr(pWnd);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue