Skip to content

W
wine-winehq
Commit 53c2028b authored by Per Ångström's avatar Per Ångström Committed by Alexandre Julliard
Browse files
Options

Fixed a problem with apps that override the default behaviour on

WM_MOUSEACTIVATE message (main window was not activated).
parent 423813e3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
windows/message.c
View file @ 53c2028b
...@@ -316,7 +316,7 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest, ...@@ -316,7 +316,7 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest,
/* Activate the window if needed */ /* Activate the window if needed */
if (hWnd != GetActiveWindow() && hWnd != GetDesktopWindow()) if (hwndTop != GetForegroundWindow() && hwndTop != GetDesktopWindow())
{ {
LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop, LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop,
MAKELONG( hittest, message ) ); MAKELONG( hittest, message ) );
...@@ -324,10 +324,11 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest, ...@@ -324,10 +324,11 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest,
if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT)) if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
eatMsg = TRUE; eatMsg = TRUE;
if (((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT)) if (((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT)))
&& hwndTop != GetActiveWindow() ) {
if (!WINPOS_SetActiveWindow( hwndTop, TRUE , TRUE )) if (!WINPOS_SetActiveWindow( hwndTop, TRUE , TRUE ))
eatMsg = TRUE; eatMsg = TRUE;
}
} }
} }
} else sendSC = (remove && sendSC); } else sendSC = (remove && sendSC);
......
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