marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If an MDI child becomes active restore previously maximized MDI 

child.
oldstable
Dmitry Timoshkov 2005-03-22 16:45:31 +00:00 committed by Alexandre Julliard
parent caf7aefc65
commit e842676194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/user/tests/msg.c
View File

@ -2259,7 +2259,7 @@ static void test_mdi_messages(void)
0, 0, CW_USEDEFAULT, CW_USEDEFAULT,
mdi_client, 0, GetModuleHandleA(0), NULL);
assert(mdi_child);
ok_sequence(WmCreateMDIchildVisibleSeq, "Create visible MDI child window", TRUE);
ok_sequence(WmCreateMDIchildVisibleSeq, "Create visible MDI child window", FALSE);
ok(GetWindowLongA(mdi_child, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n");
ok(IsWindowVisible(mdi_child), "MDI child should be visible\n");

15
windows/mdi.c
View File

@ -482,7 +482,7 @@ static void MDI_ChildGetMinMaxInfo( HWND client, HWND hwnd, MINMAXINFO* lpMinMax
* Note: SetWindowPos sends WM_CHILDACTIVATE to the child window that is
* being activated
*/
static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo )
static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo, BOOL activate )
{
HWND hwndPrev;
@ -507,7 +507,7 @@ static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo )
ShowWindow( hwndTo, SW_MAXIMIZE );
}
/* activate new MDI child */
SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE );
SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) );
}
}
@ -526,7 +526,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci,
{
HWND next = MDI_GetWindow(ci, child, TRUE, 0);
if (next)
MDI_SwitchActiveChild(ci, next);
MDI_SwitchActiveChild(ci, next, TRUE);
else
{
ShowWindow(child, SW_HIDE);
@ -597,6 +597,7 @@ static LONG MDI_ChildActivate( HWND client, HWND child )
SendMessageW( prevActiveWnd, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child);
}
MDI_SwitchActiveChild( clientInfo, child, FALSE );
clientInfo->hwndActiveChild = child;
MDI_RefreshMenu(clientInfo);
@ -604,7 +605,7 @@ static LONG MDI_ChildActivate( HWND client, HWND child )
if( isActiveFrameWnd )
{
SendMessageW( child, WM_NCACTIVATE, TRUE, 0L);
SetFocus(child);
SetFocus( client );
}
SendMessageW( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child );
@ -1061,7 +1062,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
case WM_MDIACTIVATE:
{
MDI_SwitchActiveChild( ci, (HWND)wParam );
MDI_SwitchActiveChild( ci, (HWND)wParam, TRUE );
return 0;
}
@ -1122,7 +1123,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
case WM_MDINEXT: /* lParam != 0 means previous window */
{
HWND next = MDI_GetWindow( ci, WIN_GetFullHandle( (HWND)wParam ), !lParam, 0 );
MDI_SwitchActiveChild( ci, next );
MDI_SwitchActiveChild( ci, next, TRUE );
break;
}
@ -1200,7 +1201,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
case WM_SIZE:
if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) &&
IsWindowVisible(ci->hwndActiveChild) )
(GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) )
{
RECT rect;