[OMPT-svn-commit] OpenMPT r22505 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Tue Dec 10 18:23:59 2024
New Revision: 22505
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22505

Log:
[Ref] Quick Start Dialog: Simplify DPI adjustment code.

Modified:
   trunk/OpenMPT/mptrack/QuickStartDialog.cpp
   trunk/OpenMPT/mptrack/QuickStartDialog.h

Modified: trunk/OpenMPT/mptrack/QuickStartDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/QuickStartDialog.cpp	Tue Dec 10 18:23:04 2024	(r22504)
+++ trunk/OpenMPT/mptrack/QuickStartDialog.cpp	Tue Dec 10 18:23:59 2024	(r22505)
@@ -22,8 +22,6 @@
 OPENMPT_NAMESPACE_BEGIN
 
 BEGIN_MESSAGE_MAP(QuickStartDlg, ResizableDialog)
-	ON_WM_SIZE()
-
 	ON_COMMAND(IDC_BUTTON1,   &QuickStartDlg::OnNew)
 	ON_COMMAND(IDC_BUTTON2,   &QuickStartDlg::OnOpen)
 	ON_COMMAND(ID_REMOVE,     &QuickStartDlg::OnRemoveMRUItem)
@@ -121,12 +119,15 @@
 
 	if(m_prevDPI)
 	{
-		CRect windowRect{CPoint{}, m_prevSize};
+		// We don't use this as a stand-alone dialog but rather embed it in the MDI child area, and it is not resized automatically.
+		CRect windowRect;
+		GetClientRect(windowRect);
 		windowRect.right = Util::muldiv(windowRect.right, GetDPI(), m_prevDPI);
 		windowRect.bottom = Util::muldiv(windowRect.bottom, GetDPI(), m_prevDPI);
 		HighDPISupport::AdjustWindowRectEx(windowRect, GetStyle(), FALSE, GetExStyle(), GetDPI());
 		SetWindowPos(nullptr, 0, 0, windowRect.Width(), windowRect.Height(), SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE);
 	}
+	m_prevDPI = GetDPI();
 
 	m_list.SetImageList(&CMainFrame::GetMainFrame()->m_PatternIcons, LVSIL_SMALL);
 	m_list.SetColumnWidth(0, LVSCW_AUTOSIZE);
@@ -195,14 +196,6 @@
 }
 
 
-void QuickStartDlg::OnSize(UINT nType, int cx, int cy)
-{
-	ResizableDialog::OnSize(nType, cx, cy);
-	m_prevSize.SetSize(cx, cy);
-	m_prevDPI = GetDPI();
-}
-
-
 void QuickStartDlg::OnNew()
 {
 	theApp.NewDocument();

Modified: trunk/OpenMPT/mptrack/QuickStartDialog.h
==============================================================================
--- trunk/OpenMPT/mptrack/QuickStartDialog.h	Tue Dec 10 18:23:04 2024	(r22504)
+++ trunk/OpenMPT/mptrack/QuickStartDialog.h	Tue Dec 10 18:23:59 2024	(r22505)
@@ -38,7 +38,6 @@
 	size_t GetItemIndex(int index) const { return static_cast<size_t>(m_list.GetItemData(index) & 0x00FF'FFFF); }
 	int GetItemGroup(int index) const { return static_cast<int>(m_list.GetItemData(index) >> 24); }
 
-	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnNew();
 	afx_msg void OnOpen();
 	afx_msg void OnRemoveMRUItem();
@@ -55,8 +54,7 @@
 	AccessibleButton m_newButton, m_openButton;
 	CBitmap m_bmpNew, m_bmpOpen;
 	std::array<std::vector<mpt::PathString>, 3> m_paths;
-	CSize m_prevSize;
-	int m_prevDPI = 96;
+	int m_prevDPI = 0;
 	bool m_groupsEnabled = false;
 };