Tera TermRevision: 10441
https://osdn.net/projects/ttssh2/scm/svn/commits/10441
Author: zmatsuo
Date: 2022-12-27 23:04:06 +0900 (Tue, 27 Dec 2022)
Log Message:
-----------
フォントダイアログのフォント名が空になる場合があるので修正
- フォント構造体に適切な値を設定するよう修正
ticket #45658
MFT r10440
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10440
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/45658
Modified Paths:
--------------
branches/4-stable/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: branches/4-stable/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/vtwin.cpp 2022-12-27 14:00:54 UTC (rev 10440)
+++ branches/4-stable/teraterm/teraterm/vtwin.cpp 2022-12-27 14:04:06 UTC (rev 10441)
@@ -4767,12 +4767,19 @@
// LOGFONT\x8F\x80\x94\xF5
memset(&LogFont, 0, sizeof(LogFont));
- strncpy_s(LogFont.lfFaceName, sizeof(LogFont.lfFaceName), ts.DialogFontName, _TRUNCATE);
- LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, ts.DialogFontPoint);
- LogFont.lfCharSet = ts.DialogFontCharSet;
- if (LogFont.lfFaceName[0] == 0) {
+ if (ts.DialogFontName[0] == 0) {
GetMessageboxFont(&LogFont);
}
+ else {
+ strncpy_s(LogFont.lfFaceName, sizeof(LogFont.lfFaceName), ts.DialogFontName, _TRUNCATE);
+ LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, ts.DialogFontPoint);
+ LogFont.lfCharSet = ts.DialogFontCharSet;
+ LogFont.lfWeight = FW_NORMAL;
+ LogFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+ LogFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+ LogFont.lfQuality = DEFAULT_QUALITY;
+ LogFont.lfPitchAndFamily = DEFAULT_PITCH | FF_ROMAN;
+ }
// \x83_\x83C\x83A\x83\x8D\x83O\x95\\x8E\xA6
memset(&cf, 0, sizeof(cf));