Commit 4f9b4fd3 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

Test whether an active maximized MDI child is visible.

parent 36241ced
...@@ -980,7 +980,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient, ...@@ -980,7 +980,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient,
if (ci->frameTitle) if (ci->frameTitle)
{ {
if (IsZoomed(ci->hwndActiveChild)) if (IsZoomed(ci->hwndActiveChild) && IsWindowVisible(ci->hwndActiveChild))
{ {
/* combine frame title and child title if possible */ /* combine frame title and child title if possible */
...@@ -1216,7 +1216,8 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, ...@@ -1216,7 +1216,8 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
return 0; return 0;
case WM_SIZE: case WM_SIZE:
if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) ) if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) &&
IsWindowVisible(ci->hwndActiveChild) )
{ {
RECT rect; RECT rect;
...@@ -1506,6 +1507,9 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, ...@@ -1506,6 +1507,9 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
break; break;
case WM_SIZE: case WM_SIZE:
if (wParam == SIZE_MAXIMIZED && !IsWindowVisible(hwnd))
wParam = SIZE_RESTORED;
if( hwnd == ci->hwndActiveChild && wParam != SIZE_MAXIMIZED ) if( hwnd == ci->hwndActiveChild && wParam != SIZE_MAXIMIZED )
{ {
MDI_RestoreFrameMenu( GetParent(client), hwnd ); MDI_RestoreFrameMenu( GetParent(client), hwnd );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment