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

gdi32: Scale default GUI fonts to match screen resolution changes.

Browse source
This commit is contained in:
Dmitry Timoshkov 2013-06-17 19:02:25 +09:00 committed by Alexandre Julliard
parent 6834a44dc4
commit 705a0f0238
2 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
dlls/gdi32/gdiobj.c
View file

@ -597,6 +597,49 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle )
return entry != NULL;
}
/******************************************************************************
* get_dpi (internal)
*
* get the dpi from the registry
*/
static int get_dpi( void )
{
static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'};
static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'};
static int dpi = -1;
HKEY hkey;
if (dpi != -1) return dpi;
if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS)
{
DWORD type, size;
int new_dpi;
size = sizeof(new_dpi);
if (RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS)
{
if (type == REG_DWORD && new_dpi != 0)
dpi = new_dpi;
}
RegCloseKey(hkey);
}
if (dpi <= 0) dpi = 96;
return dpi;
}
static HFONT create_scaled_font( const LOGFONTW *deffont )
{
LOGFONTW lf;
LONG height;
lf = *deffont;
height = abs(lf.lfHeight) * get_dpi() / 96;
lf.lfHeight = deffont->lfHeight < 0 ? -height : height;
return CreateFontIndirectW( &lf );
}
/***********************************************************************
* DllMain
@ -636,10 +679,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
/* language-dependent stock fonts */
deffonts = get_default_fonts(get_default_charset());
stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont );
stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont );
stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont );
stock_objects[DEVICE_DEFAULT_FONT] = create_scaled_font( &deffonts->DeviceDefaultFont );
stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont );
stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont );
stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont );
stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush );
stock_objects[DC_PEN] = CreatePenIndirect( &DCPen );

7
dlls/gdi32/tests/font.c
View file

@ -5012,7 +5012,12 @@ static void test_stock_fonts(void)
}
/* FIXME: Remove once Wine is fixed */
if (td[i][j].dpi != 96) todo_wine
if (td[i][j].dpi != 96 &&
/* MS Sans Serif for 120 dpi and higher should include 12 pixel bitmap set */
((!strcmp(td[i][j].face_name, "MS Sans Serif") && td[i][j].height == 12) ||
/* System for 120 dpi and higher should include 20 pixel bitmap set */
(!strcmp(td[i][j].face_name, "System") && td[i][j].height > 16)))
todo_wine
ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height);
else
ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height);