[commit] r2775 - trunk/GME/Console

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Jul  8 13:30:50 2019
New Revision: 2775

Log:
Console: use DPI-aware fixed-width font for script input

Modified:
   trunk/GME/Console/ConsoleCtl.cpp
   trunk/GME/Console/ConsoleCtl.h

Modified: trunk/GME/Console/ConsoleCtl.cpp
==============================================================================
--- trunk/GME/Console/ConsoleCtl.cpp	Mon Jul  8 13:30:46 2019	(r2774)
+++ trunk/GME/Console/ConsoleCtl.cpp	Mon Jul  8 13:30:50 2019	(r2775)
@@ -434,13 +434,23 @@
 	}
 	m_edit.ModifyStyleEx(WS_EX_CLIENTEDGE, WS_EX_STATICEDGE);
 
+	HDC hdc = ::GetDC(NULL);
+	int _dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
+	::ReleaseDC(NULL, hdc);
+	if (m_inputEditFont.CreateFontW(-MulDiv(12, _dpiY, 72), 0, 0, 0, FW_NORMAL, false, false,
+		0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, CLEARTYPE_QUALITY,
+		FIXED_PITCH | FF_MODERN, L"Courier New"))
+	{
+		m_edit.SetFont(&m_inputEditFont);
+	}
 
-	m_hIco1 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_LOADSCR),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-	m_hIco2 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_EXECSCR),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-	m_hIco3 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_CLEANCON),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-	m_hIcou = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNUP),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-	m_hIcod = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNDN),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-	m_hIcor = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNRET),	IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+	int iconSize = MulDiv(16, _dpiY, 96);
+	m_hIco1 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_LOADSCR),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+	m_hIco2 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_EXECSCR),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+	m_hIco3 = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_CLEANCON),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+	m_hIcou = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNUP),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+	m_hIcod = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNDN),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+	m_hIcor = (HICON)::LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_BTNRET),	IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
 
 	rect.bottom = rect.right = 100;
 	rect.left = rect.right - BUTTON_ICON_SIZE;

Modified: trunk/GME/Console/ConsoleCtl.h
==============================================================================
--- trunk/GME/Console/ConsoleCtl.h	Mon Jul  8 13:30:46 2019	(r2774)
+++ trunk/GME/Console/ConsoleCtl.h	Mon Jul  8 13:30:50 2019	(r2775)
@@ -37,6 +37,7 @@
 
 	CHtmlCtrl   m_browser;
 	CScriptEdit	m_edit;
+	CFont m_inputEditFont;
 	CButton	    m_cmdButton;
 	CButton	    m_exeButton;
 	CButton     m_clrButton;