ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Fix switching focus to parent after child hiding.

This commit is contained in:
Ilya Shpigor 2009-11-04 15:49:11 +03:00 committed by Alexandre Julliard
parent 3ec06f8082
commit e6f0404076
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/user32/tests/win.c
View File

@ -2298,7 +2298,7 @@ static LRESULT WINAPI set_focus_on_activate_proc(HWND hwnd, UINT msg, WPARAM wp,
static void test_SetFocus(HWND hwnd) static void test_SetFocus(HWND hwnd)
{ {
HWND child; HWND child, child2;
WNDPROC old_wnd_proc; WNDPROC old_wnd_proc;
/* check if we can set focus to non-visible windows */ /* check if we can set focus to non-visible windows */
@ -2325,6 +2325,14 @@ static void test_SetFocus(HWND hwnd)
ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child );
ok( GetFocus() == hwnd, "Focus should be on parent %p, not %p\n", hwnd, GetFocus() ); ok( GetFocus() == hwnd, "Focus should be on parent %p, not %p\n", hwnd, GetFocus() );
ShowWindow(child, SW_SHOW); ShowWindow(child, SW_SHOW);
child2 = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 0, 0, child, 0, 0, NULL);
assert(child2);
ShowWindow(child2, SW_SHOW);
SetFocus(child2);
ShowWindow(child, SW_HIDE);
ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child );
ok( GetFocus() == child2, "Focus should be on %p, not %p\n", child2, GetFocus() );
ShowWindow(child, SW_SHOW);
SetFocus(child); SetFocus(child);
ok( GetFocus() == child, "Focus should be on child %p\n", child ); ok( GetFocus() == child, "Focus should be on child %p\n", child );
SetWindowPos(child,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_HIDEWINDOW); SetWindowPos(child,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_HIDEWINDOW);
@ -2368,6 +2376,7 @@ todo_wine
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc);
DestroyWindow( child2 );
DestroyWindow( child ); DestroyWindow( child );
} }

2
dlls/user32/winpos.c
View File

@ -1056,7 +1056,7 @@ static BOOL show_window( HWND hwnd, INT cmd )
/* Revert focus to parent */ /* Revert focus to parent */
hFocus = GetFocus(); hFocus = GetFocus();
if (hwnd == hFocus || IsChild(hwnd, hFocus)) if (hwnd == hFocus)
{ {
HWND parent = GetAncestor(hwnd, GA_PARENT); HWND parent = GetAncestor(hwnd, GA_PARENT);
if (parent == GetDesktopWindow()) parent = 0; if (parent == GetDesktopWindow()) parent = 0;