WIP: Add support for per-monitor DPI awareness (10)

Author: sdottaka

Externals/crystaledit/Sample/MainFrm.cpp

@@ -6,6 +6,7 @@
 
 #include "MainFrm.h"
 #include "ceditcmd.h"
+#include <commoncontrols.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -61,7 +62,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		return -1;
 
 	if (!m_wndToolBar.Create(this) ||
-		!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
+		!LoadToolBar())
 	{
 		TRACE0("Failed to create toolbar\n");
 		return -1;      // fail to create
@@ -107,6 +108,11 @@ LRESULT CMainFrame::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 {
 	__super::OnDpiChanged(wParam, lParam);
 	DpiAware::UpdateAfxDataSysMetrics(GetDpi());
+	LoadToolBar();
+	const RECT* pRect = reinterpret_cast<RECT *>(lParam);
+	SetWindowPos(nullptr, pRect->left, pRect->top,
+		pRect->right - pRect->left,
+		pRect->bottom - pRect->top, SWP_NOZORDER | SWP_NOACTIVATE);
 	Default();
 	return 0;
 }
@@ -119,6 +125,26 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 	return __super::PreCreateWindow(cs);
 }
 
+BOOL CMainFrame::LoadToolBar()
+{
+	m_wndToolBar.LoadToolBar(IDR_MAINFRAME);
+	CToolBarCtrl& toolbarCtrl = m_wndToolBar.GetToolBarCtrl();
+	int cx = 16;
+	int cy = 15;
+	m_imgListToolBar.DeleteImageList();
+	m_imgListToolBar.Create(IDR_MAINFRAME, cx, 0, RGB(192, 192, 192));
+	CComQIPtr<IImageList2> pImageList2(reinterpret_cast<IImageList *>(m_imgListToolBar.m_hImageList));
+	if (pImageList2)
+	{
+		cx = 16 * m_dpi / 96;
+		cy = 15 * m_dpi / 96;
+		HRESULT hr = pImageList2->Resize(cx, cy);
+	}
+	toolbarCtrl.SetImageList(&m_imgListToolBar);
+	toolbarCtrl.SetButtonSize({ cx + 8, cy + 8 });
+	return TRUE;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame diagnostics
 

Externals/crystaledit/Sample/MainFrm.h

@@ -31,10 +31,12 @@ class CMainFrame : public DpiAware::CDpiAwareWnd<CMDIFrameWnd>
 	virtual void AssertValid() const;
 	virtual void Dump(CDumpContext& dc) const;
 #endif
+	BOOL LoadToolBar();
 
 protected:  // control bar embedded members
 	CStatusBar  m_wndStatusBar;
 	CToolBar    m_wndToolBar;
+	CImageList  m_imgListToolBar;
 
 // Generated message map functions
 protected:

Externals/crystaledit/editlib/utils/DpiAware.cpp

@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: BSL-1.0
+// Copyright (c) 2020 Takashi Sawanaka
+
 #include "StdAfx.h"
 #include "DpiAware.h"
 #include <commoncontrols.h>
@@ -16,7 +19,7 @@ namespace DpiAware
 
 	bool DpiAwareSupport = []()
 	{
-		DPIOnInit = MulDiv(96, ::GetSystemMetrics(SM_CXSMICON), 16);
+		DPIOnInit = MulDiv(USER_DEFAULT_SCREEN_DPI, ::GetSystemMetrics(SM_CXSMICON), 16);
 		HMODULE hLibraryUser32 = GetModuleHandleW(L"user32.dll");
 		if (hLibraryUser32)
 		{
@@ -121,7 +124,7 @@ namespace DpiAware
 		else
 		{
 			int cxsmicon = ::GetSystemMetrics(SM_CXSMICON);
-			int iconsize = MulDiv(16, dpi, 96);
+			int iconsize = MulDiv(16, dpi, USER_DEFAULT_SCREEN_DPI);
 			int size = SHIL_EXTRALARGE;
 			if (iconsize < cxsmicon * 2)
 				size = SHIL_SMALL;

Externals/crystaledit/editlib/utils/DpiAware.h

@@ -1,5 +1,8 @@
 #pragma once
 
+// SPDX-License-Identifier: BSL-1.0
+// Copyright (c) 2020 Takashi Sawanaka
+
 #include <afxwin.h>
 #include <type_traits>
 #include "mfc_templ_defines.h"
@@ -9,13 +12,13 @@
 #define WM_DPICHANGED_BEFOREPARENT 0x02E2
 #define WM_DPICHANGED_AFTERPARENT 0x02E3
 #endif
+#ifndef USER_DEFAULT_SCREEN_DPI
+#define USER_DEFAULT_SCREEN_DPI 96
+#endif
 
 namespace DpiAware
 {
-	struct NONCLIENTMETRICS6 : public NONCLIENTMETRICS
-	{
-		int     iPaddedBorderWidth;
-	};
+	struct NONCLIENTMETRICS6 : public NONCLIENTMETRICS { int iPaddedBorderWidth; };
 
 	using AdjustWindowRectExForDpiType = BOOL(__stdcall*)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
 	using GetDpiForWindowType = UINT(__stdcall*)(HWND hwnd);

Src/Common/BCMenu.cpp

@@ -779,11 +779,11 @@ void BCMenu::MeasureItem( LPMEASUREITEMSTRUCT lpMIS )
 
 		const int BCMENU_PAD=4;
 		if (m_hTheme == nullptr)
-			lpMIS->itemWidth = MulDiv(m_iconX+BCMENU_PAD+8, dpi, 96) +t.cx;
+			lpMIS->itemWidth = MulDiv(m_iconX+BCMENU_PAD+8, dpi, USER_DEFAULT_SCREEN_DPI) +t.cx;
 		else
 			lpMIS->itemWidth = m_gutterWidth+m_textBorder+t.cx+m_arrowWidth;
 		int temp = DpiAware::GetSystemMetricsForDpi(SM_CYMENU, dpi);
-		int temp2 = MulDiv(m_iconY + BCMENU_PAD, dpi, 96);
+		int temp2 = MulDiv(m_iconY + BCMENU_PAD, dpi, USER_DEFAULT_SCREEN_DPI);
 		lpMIS->itemHeight = temp>temp2 ? temp : temp2;
 	}
 }

Src/Common/MessageBoxDialog.cpp

@@ -811,6 +811,7 @@ LRESULT CMessageBoxDialog::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 	GetDlgItem(IDCHECKBOX)->SetFont(&m_font);
 	m_stcMessage.SetFont(&m_fontMainInstruction);
 	Invalidate();
+	m_sDialogUnit = {};
 	return 0;
 }
 
@@ -1178,38 +1179,45 @@ void CMessageBoxDialog::ParseStyle ( )
 	if ( ( m_nStyle & MB_ICONMASK ) && ( m_hIcon == nullptr ) )
 	{
 		// Switch the icon.
+		LPTSTR icon = nullptr;
 		switch ( m_nStyle & MB_ICONMASK )
 		{
 
 			case MB_ICONEXCLAMATION:
 
 				// Load the icon with the exclamation mark.
-				m_hIcon = AfxGetApp()->LoadStandardIcon(IDI_EXCLAMATION);
+				icon = IDI_EXCLAMATION;
 
 				break;
 
 			case MB_ICONHAND:
 
 				// Load the icon with the error symbol.
-				m_hIcon = AfxGetApp()->LoadStandardIcon(IDI_HAND);
+				icon = IDI_HAND;
 
 				break;
 
 			case MB_ICONQUESTION:
 
 				// Load the icon with the question mark.
-				m_hIcon = AfxGetApp()->LoadStandardIcon(IDI_QUESTION);
+				icon = IDI_QUESTION;
 
 				break;
 
 			case MB_ICONASTERISK:
 
 				// Load the icon with the information symbol.
-				m_hIcon = AfxGetApp()->LoadStandardIcon(IDI_ASTERISK);
+				icon = IDI_ASTERISK;
 
 				break;
 
 		}
+		if (icon)
+		{
+			const int cx = GetSystemMetrics(SM_CXICON);
+			const int cy = GetSystemMetrics(SM_CYICON);
+			DpiAware::LoadIconWithScaleDown(nullptr, icon, cx, cy, &m_hIcon);
+		}
 	}
 }
 

Src/Common/sizecbar.cpp

@@ -96,6 +96,7 @@ BEGIN_MESSAGE_MAP(CSizingControlBar, DpiAware::CDpiAwareWnd<baseCSizingControlBa
     ON_WM_SIZE()
     //}}AFX_MSG_MAP
     ON_MESSAGE(WM_SETTEXT, OnSetText)
+    ON_MESSAGE(WM_DPICHANGED_BEFOREPARENT, OnDpiChangedBeforeParent)
 END_MESSAGE_MAP()
 
 BOOL CSizingControlBar::Create(LPCTSTR lpszWindowName,
@@ -1176,6 +1177,23 @@ void CSizingControlBar::GlobalSaveState(CFrameWnd* pFrame,
     }
 }
 
+LRESULT CSizingControlBar::OnDpiChangedBeforeParent(WPARAM wParam, LPARAM lParam)
+{
+    int olddpi = m_dpi;
+
+    __super::OnDpiChangedBeforeParent(wParam, lParam);
+
+    for (auto& size : { &m_szHorz, &m_szVert, &m_szFloat })
+    {
+        size->cx = MulDiv(size->cx, m_dpi, olddpi);
+        size->cy = MulDiv(size->cy, m_dpi, olddpi);
+    }
+
+    m_pDockSite->DelayRecalcLayout();
+
+    return 0;
+}
+
 #ifdef _SCB_REPLACE_MINIFRAME
 #ifndef _SCB_MINIFRAME_CAPTION
 /////////////////////////////////////////////////////////////////////////////

Src/Common/sizecbar.h

@@ -179,6 +179,7 @@ class CSizingControlBar : public DpiAware::CDpiAwareWnd<baseCSizingControlBar>
     afx_msg void OnSize(UINT nType, int cx, int cy);
     //}}AFX_MSG
     afx_msg LRESULT OnSetText(WPARAM wParam, LPARAM lParam);
+    afx_msg LRESULT OnDpiChangedBeforeParent(WPARAM wParam, LPARAM lParam);
 
     DECLARE_MESSAGE_MAP()
 

Src/MainFrm.cpp

@@ -2577,12 +2577,8 @@ LRESULT CMainFrame::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 {
 	int olddpi = m_dpi;
 
-	Default();
-
 	__super::OnDpiChanged(wParam, lParam);
 
-	RECT* const prcNew = (RECT*)lParam;
-
 	DpiAware::UpdateAfxDataSysMetrics(m_dpi);
 	BCMenu::ReopenTheme(m_dpi);
 
@@ -2592,6 +2588,11 @@ LRESULT CMainFrame::OnDpiChanged(WPARAM wParam, LPARAM lParam)
 	UpdateFont(FRAME_FILE);
 	UpdateFont(FRAME_FOLDER);
 
+	const RECT* pRect = reinterpret_cast<RECT*>(lParam);
+	SetWindowPos(nullptr, pRect->left, pRect->top,
+		pRect->right - pRect->left,
+		pRect->bottom - pRect->top, SWP_NOZORDER | SWP_NOACTIVATE);
+
 	return 0;
 }