Skip to content

W
wine-winehq
Commit 1fd63057 authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard
Browse files
Options

WM_ACTIVATE default processing should set window focus.

Should fix focus problems in non-managed mode.
parent 4a8639cc
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
windows/defwnd.c
View file @ 1fd63057
...@@ -225,9 +225,16 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam, ...@@ -225,9 +225,16 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT32 msg, WPARAM32 wParam,
return (LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE; return (LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE;
case WM_ACTIVATE: case WM_ACTIVATE:
if (LOWORD(wParam) != WA_INACTIVE) /* The default action in Windows is to set the keyboard focus to
* the window, if it's being activated and not minimized */
if (LOWORD(wParam) != WA_INACTIVE) {
/* I don't know who put this SetWindowPos here, it does not
* seem very logical to have it here... (FIXME?) */
SetWindowPos32(wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0, SetWindowPos32(wndPtr->hwndSelf, HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE); SWP_NOMOVE | SWP_NOSIZE);
if (!(wndPtr->dwStyle & WS_MINIMIZE))
SetFocus32(wndPtr->hwndSelf);
}
break; break;
case WM_ERASEBKGND: case WM_ERASEBKGND:
......
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