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

dwrite: Allow for a weight difference in GetFirstMatchingFont().

This commit is contained in:
Nikolay Sivov 2014-10-27 14:53:59 +03:00 committed by Alexandre Julliard
parent 6706ada9f8
commit 5a5a6bdd92
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/dwrite/font.c
View File

@ -1233,17 +1233,21 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i
}
else
{
int i;
for (i = 0; i < This->data->font_count; i++)
{
if (style == This->data->fonts[i]->style &&
weight == This->data->fonts[i]->weight &&
stretch == This->data->fonts[i]->stretch)
{
return create_font_from_data(This->data->fonts[i], iface, font);
UINT32 min_weight_diff = ~0u;
int found = -1, i;
for (i = 0; i < This->data->font_count; i++) {
if (style == This->data->fonts[i]->style && stretch == This->data->fonts[i]->stretch) {
DWRITE_FONT_WEIGHT font_weight = This->data->fonts[i]->weight;
UINT32 weight_diff = abs(font_weight - weight);
if (weight_diff < min_weight_diff) {
min_weight_diff = weight_diff;
found = i;
}
}
}
return DWRITE_E_NOFONT;
return found != -1 ? create_font_from_data(This->data->fonts[found], iface, font) : DWRITE_E_NOFONT;
}
}