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

user32: Take the arrange flags into account when positioning icon windows. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-05-26 13:53:37 +09:00
parent c8ef7e835c
commit 100239d90f
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
dlls/user32/winpos.c
View File

@ -852,7 +852,11 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt )
RECT rect, rectParent; RECT rect, rectParent;
HWND parent, child; HWND parent, child;
HRGN hrgn, tmp; HRGN hrgn, tmp;
int xspacing, yspacing; int x, y, xspacing, yspacing;
MINIMIZEDMETRICS metrics;
metrics.cbSize = sizeof(metrics);
SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 );
parent = GetAncestor( hwnd, GA_PARENT ); parent = GetAncestor( hwnd, GA_PARENT );
GetClientRect( parent, &rectParent ); GetClientRect( parent, &rectParent );
@ -868,7 +872,7 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt )
hrgn = CreateRectRgn( 0, 0, 0, 0 ); hrgn = CreateRectRgn( 0, 0, 0, 0 );
tmp = CreateRectRgn( 0, 0, 0, 0 ); tmp = CreateRectRgn( 0, 0, 0, 0 );
for (child = GetWindow( parent, GW_HWNDFIRST ); child; child = GetWindow( child, GW_HWNDNEXT )) for (child = GetWindow( parent, GW_CHILD ); child; child = GetWindow( child, GW_HWNDNEXT ))
{ {
if (child == hwnd) continue; if (child == hwnd) continue;
if ((GetWindowLongW( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) if ((GetWindowLongW( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE))
@ -881,12 +885,30 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt )
} }
DeleteObject( tmp ); DeleteObject( tmp );
for (rect.bottom = rectParent.bottom; rect.bottom >= yspacing; rect.bottom -= yspacing) for (y = 0; y < (rectParent.bottom - rectParent.top) / yspacing; y++)
{ {
for (rect.left = rectParent.left; rect.left <= rectParent.right - xspacing; rect.left += xspacing) if (metrics.iArrange & ARW_STARTTOP)
{ {
rect.right = rect.left + xspacing; rect.top = rectParent.top + y * yspacing;
rect.bottom = rect.top + yspacing;
}
else
{
rect.bottom = rectParent.bottom - y * yspacing;
rect.top = rect.bottom - yspacing; rect.top = rect.bottom - yspacing;
}
for (x = 0; x < (rectParent.right - rectParent.left) / xspacing; x++)
{
if (metrics.iArrange & ARW_STARTRIGHT)
{
rect.right = rectParent.right - x * xspacing;
rect.left = rect.right - xspacing;
}
else
{
rect.left = rectParent.left + x * xspacing;
rect.right = rect.left + xspacing;
}
if (!RectInRegion( hrgn, &rect )) if (!RectInRegion( hrgn, &rect ))
{ {
/* No window was found, so it's OK for us */ /* No window was found, so it's OK for us */
@ -2459,10 +2481,13 @@ UINT WINAPI ArrangeIconicWindows( HWND parent )
RECT rectParent; RECT rectParent;
HWND hwndChild; HWND hwndChild;
INT x, y, xspacing, yspacing; INT x, y, xspacing, yspacing;
POINT pt;
MINIMIZEDMETRICS metrics;
metrics.cbSize = sizeof(metrics);
SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 );
GetClientRect( parent, &rectParent ); GetClientRect( parent, &rectParent );
x = rectParent.left; x = y = 0;
y = rectParent.bottom;
xspacing = GetSystemMetrics(SM_CXICONSPACING); xspacing = GetSystemMetrics(SM_CXICONSPACING);
yspacing = GetSystemMetrics(SM_CYICONSPACING); yspacing = GetSystemMetrics(SM_CYICONSPACING);
@ -2473,17 +2498,25 @@ UINT WINAPI ArrangeIconicWindows( HWND parent )
{ {
WINPOS_ShowIconTitle( hwndChild, FALSE ); WINPOS_ShowIconTitle( hwndChild, FALSE );
SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, if (metrics.iArrange & ARW_STARTRIGHT)
y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0, pt.x = rectParent.right - (x + 1) * xspacing;
else
pt.x = rectParent.left + x * xspacing;
if (metrics.iArrange & ARW_STARTTOP)
pt.y = rectParent.top + y * yspacing;
else
pt.y = rectParent.bottom - (y + 1) * yspacing;
SetWindowPos( hwndChild, 0, pt.x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
pt.y + (yspacing - GetSystemMetrics(SM_CYICON)) / 2, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
if( IsWindow(hwndChild) ) if( IsWindow(hwndChild) )
WINPOS_ShowIconTitle(hwndChild , TRUE ); WINPOS_ShowIconTitle(hwndChild , TRUE );
if (x <= rectParent.right - xspacing) x += xspacing; if (++x >= (rectParent.right - rectParent.left) / xspacing)
else
{ {
x = rectParent.left; x = 0;
y -= yspacing; y++;
} }
} }
hwndChild = GetWindow( hwndChild, GW_HWNDNEXT ); hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );