Use a single Unicode charset and specify language-specific font for better (?) viewing
This commit is contained in:
parent
09c62f5909
commit
2d88ddc3e4
|
@ -446,29 +446,24 @@ void gdrv::grtext_draw_ttext_in_box(LPCSTR text, int xOff, int yOff, int width,
|
||||||
sscanf_s(fontColor, "%d %d %d", &grtext_red, &grtext_green, &grtext_blue);
|
sscanf_s(fontColor, "%d %d %d", &grtext_red, &grtext_green, &grtext_blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
// DEFAULT_CHARSET in unicode build.
|
char font[30];
|
||||||
int charset;
|
|
||||||
switch (options::Options.Language)
|
switch (options::Options.Language)
|
||||||
{
|
{
|
||||||
default:
|
|
||||||
case Languages::English:
|
|
||||||
charset = ANSI_CHARSET;
|
|
||||||
break;
|
|
||||||
case Languages::Russian:
|
|
||||||
charset = RUSSIAN_CHARSET;
|
|
||||||
break;
|
|
||||||
case Languages::TraditionalChinese:
|
case Languages::TraditionalChinese:
|
||||||
charset = CHINESEBIG5_CHARSET;
|
strcpy_s(font, "Microsoft JhengHei");
|
||||||
break;
|
break;
|
||||||
case Languages::SimplifiedChinese:
|
case Languages::SimplifiedChinese:
|
||||||
charset = GB2312_CHARSET;
|
strcpy_s(font, "Microsoft YaHei");
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
strcpy_s(font, "Arial");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DEFAULT_CHARSET in unicode build.
|
||||||
// Default font does not scale well
|
// Default font does not scale well
|
||||||
auto hNewFont = CreateFont(fontSize, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
|
auto hNewFont = CreateFont(fontSize, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
|
||||||
charset, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
|
DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
|
||||||
DEFAULT_PITCH | FF_SWISS, "Arial");
|
DEFAULT_PITCH | FF_SWISS, font);
|
||||||
HFONT hOldFont = static_cast<HFONT>(SelectObject(dc, hNewFont));
|
HFONT hOldFont = static_cast<HFONT>(SelectObject(dc, hNewFont));
|
||||||
int prevMode = SetBkMode(dc, TRANSPARENT);
|
int prevMode = SetBkMode(dc, TRANSPARENT);
|
||||||
COLORREF color = SetTextColor(dc, grtext_red | grtext_green << 8 | grtext_blue << 16);
|
COLORREF color = SetTextColor(dc, grtext_red | grtext_green << 8 | grtext_blue << 16);
|
||||||
|
|
Loading…
Reference in New Issue