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

user: Adapt system metrics for multi-monitor setups.

This commit is contained in:
Alexandre Julliard 2006-10-23 14:29:57 +02:00
parent 9d6d54f5e6
commit a12f15325a
2 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlls/user/sysparams.c
View File

@ -488,6 +488,31 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A
SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMessageFont, &lpnm32W->lfMessageFont );
}
/* Helper functions to retrieve monitors info */
struct monitor_info
{
int count;
RECT virtual_rect;
};
static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp )
{
struct monitor_info *info = (struct monitor_info *)lp;
info->count++;
UnionRect( &info->virtual_rect, &info->virtual_rect, rect );
return TRUE;
}
static void get_monitors_info( struct monitor_info *info )
{
info->count = 0;
SetRectEmpty( &info->virtual_rect );
EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info );
}
/* get text metrics and/or "average" char width of the specified logfont
* for the specified dc */
static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW * ptm, UINT *psz)
@ -2677,9 +2702,9 @@ INT WINAPI GetSystemMetrics( INT index )
if (!spi_loaded[SPI_NONCLIENTMETRICS_IDX]) load_nonclient_metrics();
return nonclient_metrics.iCaptionHeight + 6;
case SM_CXMAXTRACK:
return GetSystemMetrics(SM_CXSCREEN) + 4 + 2 * GetSystemMetrics(SM_CXFRAME);
return GetSystemMetrics(SM_CXVIRTUALSCREEN) + 4 + 2 * GetSystemMetrics(SM_CXFRAME);
case SM_CYMAXTRACK:
return GetSystemMetrics(SM_CYSCREEN) + 4 + 2 * GetSystemMetrics(SM_CYFRAME);
return GetSystemMetrics(SM_CYVIRTUALSCREEN) + 4 + 2 * GetSystemMetrics(SM_CYFRAME);
case SM_CXMAXIMIZED:
/* FIXME: subtract the width of any vertical application toolbars*/
return GetSystemMetrics(SM_CXSCREEN) + 2 * GetSystemMetrics(SM_CXFRAME);
@ -2708,14 +2733,35 @@ INT WINAPI GetSystemMetrics( INT index )
case SM_MOUSEWHEELPRESENT:
return 1;
case SM_XVIRTUALSCREEN:
{
struct monitor_info info;
get_monitors_info( &info );
return info.virtual_rect.left;
}
case SM_YVIRTUALSCREEN:
return 0;
{
struct monitor_info info;
get_monitors_info( &info );
return info.virtual_rect.top;
}
case SM_CXVIRTUALSCREEN:
return GetSystemMetrics(SM_CXSCREEN);
{
struct monitor_info info;
get_monitors_info( &info );
return info.virtual_rect.right - info.virtual_rect.left;
}
case SM_CYVIRTUALSCREEN:
return GetSystemMetrics(SM_CYSCREEN);
{
struct monitor_info info;
get_monitors_info( &info );
return info.virtual_rect.bottom - info.virtual_rect.top;
}
case SM_CMONITORS:
return 1;
{
struct monitor_info info;
get_monitors_info( &info );
return info.count;
}
case SM_SAMEDISPLAYFORMAT:
return 1;
case SM_IMMENABLED:

4
dlls/user/tests/sysparams.c
View File

@ -2384,9 +2384,9 @@ void test_GetSystemMetrics( void)
/* SM_ARRANGE */
ok_gsm( SM_CXMINIMIZED, minim.iWidth + 6);
ok_gsm( SM_CYMINIMIZED, GetSystemMetrics( SM_CYCAPTION) + 5);
ok_gsm( SM_CXMAXTRACK, GetSystemMetrics( SM_CXSCREEN) +
ok_gsm( SM_CXMAXTRACK, GetSystemMetrics( SM_CXVIRTUALSCREEN) +
4 + 2 * GetSystemMetrics( SM_CXFRAME));
ok_gsm( SM_CYMAXTRACK, GetSystemMetrics( SM_CYSCREEN) +
ok_gsm( SM_CYMAXTRACK, GetSystemMetrics( SM_CYVIRTUALSCREEN) +
4 + 2 * GetSystemMetrics( SM_CYFRAME));
/* the next two cannot really be tested as they depend on (application)
* toolbars */