Tera TermRevision: 10390
https://osdn.net/projects/ttssh2/scm/svn/commits/10390
Author: zmatsuo
Date: 2022-11-29 23:30:13 +0900 (Tue, 29 Nov 2022)
Log Message:
-----------
フォントダイアログの親子関係を修正した
- 「その他の設定」ダイアログの「フォント」タブの「VTウィンドウフォント」
- trunkのみ
ticket #46078
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/46078
Modified Paths:
--------------
trunk/teraterm/teraterm/font_pp.cpp
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtdisp.h
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/font_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/font_pp.cpp 2022-11-28 13:56:20 UTC (rev 10389)
+++ trunk/teraterm/teraterm/font_pp.cpp 2022-11-29 14:30:13 UTC (rev 10390)
@@ -245,7 +245,7 @@
break;
}
case IDC_VTFONT_CHOOSE | (BN_CLICKED << 16): {
- DispSetupFontDlg();
+ DispSetupFontDlg(hWnd);
SetDlgItemInt(hWnd, IDC_VTFONT_CODEPAGE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
SetVTFontString(hWnd, IDC_VTFONT_EDIT, ts);
break;
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2022-11-28 13:56:20 UTC (rev 10389)
+++ trunk/teraterm/teraterm/vtdisp.c 2022-11-29 14:30:13 UTC (rev 10390)
@@ -3258,7 +3258,7 @@
return CP_ACP;
}
-void DispSetupFontDlg(void)
+void DispSetupFontDlg(HWND hwndOwner)
// Popup the Setup Font dialogbox and
// reset window
{
@@ -3268,7 +3268,7 @@
ts.VTFlag = 1;
if (! LoadTTDLG()) return;
SetLogFont(&VTlf, FALSE);
- Ok = ChooseFontDlg(HVTWin,&VTlf,&ts);
+ Ok = ChooseFontDlg(hwndOwner,&VTlf,&ts);
if (! Ok) return;
strncpy_s(ts.VTFont, sizeof(ts.VTFont),VTlf.lfFaceName, _TRUNCATE);
Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h 2022-11-28 13:56:20 UTC (rev 10389)
+++ trunk/teraterm/teraterm/vtdisp.h 2022-11-29 14:30:13 UTC (rev 10390)
@@ -115,7 +115,7 @@
void DispAutoScroll(POINT p);
void DispHScroll(int Func, int Pos);
void DispVScroll(int Func, int Pos);
-void DispSetupFontDlg(void);
+void DispSetupFontDlg(HWND hwndOwner);
void DispRestoreWinSize(void);
void DispSetWinPos(void);
void DispSetActive(BOOL ActiveFlag);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2022-11-28 13:56:20 UTC (rev 10389)
+++ trunk/teraterm/teraterm/vtwin.cpp 2022-11-29 14:30:13 UTC (rev 10390)
@@ -4334,7 +4334,7 @@
}
else {
HelpId = HlpSetupFont;
- DispSetupFontDlg();
+ DispSetupFontDlg(m_hWnd);
// ANSI\x95\\x8E\xA6\x97p\x82̃R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x90ݒ肷\x82\xE9
BuffSetDispCodePage(UnicodeDebugParam.CodePageForANSIDraw);
}