[NOTEPAD] Follow-up of 'CJK font workaround'

- Revert some code.
- Add font name comments.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-09-07 00:54:31 +09:00
parent 5ecf017ce2
commit a5fa4891e5
5 changed files with 18 additions and 7 deletions

View file

@ -184,11 +184,13 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont));
Globals.lfFont.lfCharSet = DEFAULT_CHARSET;
Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS;
Globals.lfFont.lfEscapement = 0;
LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName,
ARRAY_SIZE(Globals.lfFont.lfFaceName));
Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN;
Globals.lfFont.lfWeight = FW_NORMAL;
Globals.lfFont.lfHeight = HeightFromPointSize(100);
Globals.lfFont.lfItalic = FALSE;
Globals.lfFont.lfOrientation = 0;
Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS;
/* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */
switch (PRIMARYLANGID(GetUserDefaultLangID()))
@ -198,7 +200,16 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
case LANG_KOREAN:
Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
break;
default:
Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN;
break;
}
Globals.lfFont.lfQuality = PROOF_QUALITY;
Globals.lfFont.lfStrikeOut = FALSE;
Globals.lfFont.lfUnderline = FALSE;
Globals.lfFont.lfWeight = FW_NORMAL;
Globals.lfFont.lfHeight = HeightFromPointSize(100);
}
hFont = CreateFontIndirect(&Globals.lfFont);