• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revisión10390 (tree)
Tiempo2022-11-29 23:30:13
Autorzmatsuo

Log Message

フォントダイアログの親子関係を修正した

- 「その他の設定」ダイアログの「フォント」タブの「VTウィンドウフォント」
- trunkのみ

ticket #46078

Cambiar Resumen

Diferencia incremental

--- trunk/teraterm/teraterm/font_pp.cpp (revision 10389)
+++ trunk/teraterm/teraterm/font_pp.cpp (revision 10390)
@@ -245,7 +245,7 @@
245245 break;
246246 }
247247 case IDC_VTFONT_CHOOSE | (BN_CLICKED << 16): {
248- DispSetupFontDlg();
248+ DispSetupFontDlg(hWnd);
249249 SetDlgItemInt(hWnd, IDC_VTFONT_CODEPAGE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
250250 SetVTFontString(hWnd, IDC_VTFONT_EDIT, ts);
251251 break;
--- trunk/teraterm/teraterm/vtdisp.c (revision 10389)
+++ trunk/teraterm/teraterm/vtdisp.c (revision 10390)
@@ -3258,7 +3258,7 @@
32583258 return CP_ACP;
32593259 }
32603260
3261-void DispSetupFontDlg(void)
3261+void DispSetupFontDlg(HWND hwndOwner)
32623262 // Popup the Setup Font dialogbox and
32633263 // reset window
32643264 {
@@ -3268,7 +3268,7 @@
32683268 ts.VTFlag = 1;
32693269 if (! LoadTTDLG()) return;
32703270 SetLogFont(&VTlf, FALSE);
3271- Ok = ChooseFontDlg(HVTWin,&VTlf,&ts);
3271+ Ok = ChooseFontDlg(hwndOwner,&VTlf,&ts);
32723272 if (! Ok) return;
32733273
32743274 strncpy_s(ts.VTFont, sizeof(ts.VTFont),VTlf.lfFaceName, _TRUNCATE);
--- trunk/teraterm/teraterm/vtdisp.h (revision 10389)
+++ trunk/teraterm/teraterm/vtdisp.h (revision 10390)
@@ -115,7 +115,7 @@
115115 void DispAutoScroll(POINT p);
116116 void DispHScroll(int Func, int Pos);
117117 void DispVScroll(int Func, int Pos);
118-void DispSetupFontDlg(void);
118+void DispSetupFontDlg(HWND hwndOwner);
119119 void DispRestoreWinSize(void);
120120 void DispSetWinPos(void);
121121 void DispSetActive(BOOL ActiveFlag);
--- trunk/teraterm/teraterm/vtwin.cpp (revision 10389)
+++ trunk/teraterm/teraterm/vtwin.cpp (revision 10390)
@@ -4334,7 +4334,7 @@
43344334 }
43354335 else {
43364336 HelpId = HlpSetupFont;
4337- DispSetupFontDlg();
4337+ DispSetupFontDlg(m_hWnd);
43384338 // ANSI表示用のコードページを設定する
43394339 BuffSetDispCodePage(UnicodeDebugParam.CodePageForANSIDraw);
43404340 }
Show on old repository browser