Skip to content

W
wine-cw
Commit 458719dc authored by Francis Beaudet's avatar Francis Beaudet Committed by Alexandre Julliard
Browse files
Options

Fixed a small bug in the behavior of maximized MDI children.

parent cb6aa38d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
windows/mdi.c
View file @ 458719dc
...@@ -582,6 +582,14 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND hWndChild ) ...@@ -582,6 +582,14 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND hWndChild )
} }
} }
/* Don't activate if it is already active. Might happen
since ShowWindow DOES activate MDI children */
if (clientInfo->hwndActiveChild == hWndChild)
{
retvalue = 0L;
goto END;
}
TRACE("%04x\n", hWndChild); TRACE("%04x\n", hWndChild);
if( GetActiveWindow() == clientPtr->parent->hwndSelf ) if( GetActiveWindow() == clientPtr->parent->hwndSelf )
...@@ -606,7 +614,6 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND hWndChild ) ...@@ -606,7 +614,6 @@ static LONG MDI_ChildActivate( WND *clientPtr, HWND hWndChild )
if( clientInfo->hwndChildMaximized != hWndChild ) { if( clientInfo->hwndChildMaximized != hWndChild ) {
if( hWndChild ) { if( hWndChild ) {
clientInfo->hwndActiveChild = hWndChild; clientInfo->hwndActiveChild = hWndChild;
clientInfo->hwndChildMaximized = hWndChild;
ShowWindow( hWndChild, SW_SHOWMAXIMIZED); ShowWindow( hWndChild, SW_SHOWMAXIMIZED);
} else } else
ShowWindow( clientInfo->hwndActiveChild, SW_SHOWNORMAL ); ShowWindow( clientInfo->hwndActiveChild, SW_SHOWNORMAL );
......
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