hammer: Scale map compile window and fix computing tools paths for it

Author: dimhotepus

hammer/mapdoc.cpp

@@ -5868,7 +5868,7 @@ void CMapDoc::OnFileRunmap(void)
 			else if (dlgExpert.m_pActiveSequence) // clicked ok
 			{
 				// run the commands in the active sequence
-				RunCommands(dlgExpert.m_pActiveSequence->m_Commands, strFile);
+				RunCommands(dlgExpert.m_pActiveSequence->m_Commands, strFile, AfxGetApp()->GetMainWnd());
 				return;
 			}
 			else
@@ -5959,7 +5959,7 @@ void CMapDoc::OnFileRunmap(void)
 		cmds.Add(cmd);
 	}
 
-	RunCommands(cmds, GetPathName());
+	RunCommands(cmds, GetPathName(), AfxGetApp()->GetMainWnd());
 }
 
 

hammer/processwnd.cpp

@@ -35,6 +35,8 @@ BEGIN_MESSAGE_MAP(CProcessWnd, CBaseWnd)
 	ON_BN_CLICKED(IDC_PROCESSWND_COPYALL, OnCopyAll)
 	ON_WM_TIMER()
 	ON_WM_CREATE()
+	ON_WM_DESTROY()
+	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
 	ON_WM_SIZE()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -222,22 +224,40 @@ int CProcessWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	CRect rctEdit;
 	rctEdit = rctClient;
-	rctEdit.bottom = rctClient.bottom - 20;
+	rctEdit.bottom = rctClient.bottom - m_dpi_behavior.ScaleOnY(20);
 
 	Edit.Create(WS_CHILD | WS_BORDER | WS_VISIBLE | WS_VSCROLL | WS_HSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN, rctClient, this, IDC_PROCESSWND_EDIT);
 	Edit.SetReadOnly(TRUE);
 	Edit.SetFont(&Font);
+	m_edit_dpi_behavior.OnCreateWindow(Edit.GetSafeHwnd());
 
 	CRect rctButton;
 	rctButton = rctClient;
-	rctButton.top = rctClient.bottom - 20;
+	rctButton.top = rctClient.bottom - m_dpi_behavior.ScaleOnY(20);
 
 	m_btnCopyAll.Create("Copy to Clipboard", WS_CHILD | WS_VISIBLE, rctButton, this, IDC_PROCESSWND_COPYALL);
 	m_btnCopyAll.SetButtonStyle(BS_PUSHBUTTON);
+	m_edit_dpi_behavior.OnCreateWindow(m_btnCopyAll.GetSafeHwnd());
 
 	return 0;
 }
 
+void CProcessWnd::OnDestroy()
+{
+	m_copy_all_dpi_behavior.OnDestroyWindow();
+	m_edit_dpi_behavior.OnDestroyWindow();
+
+	__super::OnDestroy();
+}
+
+LRESULT CProcessWnd::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	m_edit_dpi_behavior.OnWindowDpiChanged(wParam, lParam);
+	m_copy_all_dpi_behavior.OnWindowDpiChanged(wParam, lParam);
+
+	return __super::OnDpiChanged(wParam, lParam);
+}
+
 void CProcessWnd::OnSize(UINT nType, int cx, int cy) 
 {
 	__super::OnSize(nType, cx, cy);
@@ -248,12 +268,12 @@ void CProcessWnd::OnSize(UINT nType, int cx, int cy)
 
 	CRect rctEdit;
 	rctEdit = rctClient;
-	rctEdit.bottom = rctClient.bottom - 20;
+	rctEdit.bottom = rctClient.bottom - m_dpi_behavior.ScaleOnY(20);
 	Edit.MoveWindow(rctEdit);
 
 	CRect rctButton;
 	rctButton = rctClient;
-	rctButton.top = rctClient.bottom - 20;
+	rctButton.top = rctClient.bottom - m_dpi_behavior.ScaleOnY(20);
 	m_btnCopyAll.MoveWindow(rctButton);
 }
 
@@ -262,15 +282,23 @@ void CProcessWnd::OnSize(UINT nType, int cx, int cy)
 // Purpose: Prepare the process window for display. If it has not been created
 //			yet, register the class and create it.
 //-----------------------------------------------------------------------------
-void CProcessWnd::GetReady(LPCTSTR pszDocName)
+void CProcessWnd::GetReady(LPCTSTR pszDocName, CWnd *parent)
 {
 	if (!IsWindow(m_hWnd))
 	{
 		CString strClass = AfxRegisterWndClass(0, AfxGetApp()->LoadStandardCursor(IDC_ARROW), HBRUSH(GetStockObject(WHITE_BRUSH)));
 		CString title;
 		// dimhotepus: Add compiling map name to title.
 		title.Format("Compile - [%s]", pszDocName);
-		CreateEx(0, strClass, title.GetString(), WS_OVERLAPPEDWINDOW, 50, 50, 600, 400, AfxGetMainWnd()->GetSafeHwnd(), nullptr);
+
+		unsigned newDpi = ::GetDpiForWindow(parent->GetSafeHwnd());
+
+		CreateEx(0, strClass, title.GetString(), WS_OVERLAPPEDWINDOW,
+			se::windows::ui::CDpiWindowBehavior::ScaleByDpi(USER_DEFAULT_SCREEN_DPI, 50, newDpi),
+			se::windows::ui::CDpiWindowBehavior::ScaleByDpi(USER_DEFAULT_SCREEN_DPI, 50, newDpi),
+			se::windows::ui::CDpiWindowBehavior::ScaleByDpi(USER_DEFAULT_SCREEN_DPI, 800, newDpi),
+			se::windows::ui::CDpiWindowBehavior::ScaleByDpi(USER_DEFAULT_SCREEN_DPI, 600, newDpi),
+			AfxGetMainWnd()->GetSafeHwnd(), nullptr);
 	}
 
 	ShowWindow(SW_SHOW);

hammer/processwnd.h

@@ -34,8 +34,7 @@ class CProcessWnd : public CBaseWnd
 
 	void Clear();
 	void Append(CString str);
-	void GetReady();
-	void GetReady(LPCTSTR pszDocName);
+	void GetReady(LPCTSTR pszDocName, CWnd *parent);
 
 // Overrides
 	// ClassWizard generated virtual function overrides
@@ -53,10 +52,16 @@ class CProcessWnd : public CBaseWnd
 
 	CString m_EditText;
 	CButton m_btnCopyAll;
+	
+	// Need additional one as controls created dynamically after DPI is applied.
+	se::windows::ui::CDpiWindowBehavior m_edit_dpi_behavior{false};
+	se::windows::ui::CDpiWindowBehavior m_copy_all_dpi_behavior{false};
 
 	//{{AFX_MSG(CProcessWnd)
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+	afx_msg void OnDestroy();
+	afx_msg LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnCopyAll();
 	//}}AFX_MSG

hammer/runcommands.cpp

@@ -242,7 +242,7 @@ void SplitFileNameFromPath(char* szDocLongPath,
 	}
 }
 
-bool RunCommands(CCommandArray& Commands, LPCTSTR pszOrigDocName)
+bool RunCommands(CCommandArray& Commands, LPCTSTR pszOrigDocName, CWnd *parent)
 {
 	s_bRunsCommands = true;
 
@@ -254,7 +254,7 @@ bool RunCommands(CCommandArray& Commands, LPCTSTR pszOrigDocName)
 			std::generic_category().message(errno).c_str() );
 	}
 
-	procWnd.GetReady(pszOrigDocName);
+	procWnd.GetReady(pszOrigDocName, parent);
 
 	// cut up document name into file and extension components.
 	//  create two sets of buffers - one set with the long filename

hammer/runcommands.h

@@ -42,10 +42,10 @@ typedef struct
 typedef CArray<CCOMMAND, CCOMMAND&> CCommandArray;
 
 // run a list of commands:
-bool RunCommands(CCommandArray& Commands, LPCTSTR pszDocName);
-void FixGameVars(char *pszSrc, OUT_Z_CAP(dstSize) char *pszDst, intp dstSize, BOOL bUseQuotes = TRUE);
+bool RunCommands(CCommandArray& Commands, LPCTSTR pszDocName, CWnd *parent);
+void FixGameVars(char *pszSrc, OUT_Z_CAP(dstSize) char *pszDst, intp dstSize, BOOL bUseQuotes /*= TRUE*/);
 template<intp dstSize>
-void FixGameVars(char* pszSrc, OUT_Z_ARRAY char (&pszDst)[dstSize], BOOL bUseQuotes = TRUE)
+void FixGameVars(char* pszSrc, OUT_Z_ARRAY char (&pszDst)[dstSize], BOOL bUseQuotes)
 {
 	FixGameVars(pszSrc, pszDst, dstSize, bUseQuotes);
 }