system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Altered the algorithm for selecting a new focus after a window is

Browse source 
destroyed that currently has the focus.
This commit is contained in:
Dave Hawkes 2001-12-17 21:19:54 +00:00 committed by Alexandre Julliard
parent ed29c905a8
commit 5d6aacc1d5
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
windows/winpos.c
View file

@ -648,7 +648,16 @@ HWND WINAPI GetActiveWindow(void)
static BOOL WINPOS_CanActivate(HWND hwnd)
{
if (!hwnd) return FALSE;
return ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_DISABLED|WS_VISIBLE|WS_CHILD)) == WS_VISIBLE);
return ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_DISABLED|WS_CHILD)) == 0);
}
/*******************************************************************
* WINPOS_IsVisible
*/
static BOOL WINPOS_IsVisible(HWND hwnd)
{
if (!hwnd) return FALSE;
return ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) == WS_VISIBLE);
}
@ -1394,6 +1403,7 @@ void WINPOS_ActivateOtherWindow(HWND hwnd)
{
HWND hwndActive = 0;
HWND hwndTo = 0;
HWND hwndDefaultTo = 0;
HWND owner;
/* Get current active window from the active queue */
@ -1417,16 +1427,23 @@ void WINPOS_ActivateOtherWindow(HWND hwnd)
if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) ||
!(owner = GetWindow( hwnd, GW_OWNER )) ||
!WINPOS_CanActivate((hwndTo = GetAncestor( owner, GA_ROOT ))) )
!WINPOS_CanActivate((hwndTo = GetAncestor( owner, GA_ROOT ))) ||
!WINPOS_IsVisible(hwndTo))
{
HWND tmp = GetAncestor( hwnd, GA_ROOT );
hwndTo = hwndPrevActive;
while( !WINPOS_CanActivate(hwndTo) )
while( !WINPOS_CanActivate(hwndTo) || !WINPOS_IsVisible(hwndTo))
{
/* by now owned windows should've been taken care of */
if(!hwndDefaultTo && WINPOS_CanActivate(hwndTo))
hwndDefaultTo = hwndTo;
tmp = hwndTo = GetWindow( tmp, GW_HWNDNEXT );
if( !hwndTo ) break;
if( !hwndTo )
{
hwndTo = hwndDefaultTo;
break;
}
}
}