Merged revision(s) 25218-25219 from trunk/OpenMPT:

[Ref] Move last input device detection from CModControlDlg to DialogBase so that it can be used in more places.
........
[Fix] Resampling Dialog: Don't force-enable resampling to specified frequency just because keyboard focus is set to the frequency input field. Instead, this is now only done when its contents are changed, or with a mouse click as before.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32@25220 56274372-70c3-4bfc-bfc3-4c3a0b034d27

Author: sagamusix

mptrack/DialogBase.cpp

@@ -35,8 +35,16 @@ BOOL DialogBase::OnInitDialog()
 
 BOOL DialogBase::PreTranslateMessage(MSG *pMsg)
 {
-	if(pMsg && HandleGlobalKeyMessage(*pMsg))
-		return TRUE;
+	if(pMsg)
+	{
+		if(pMsg->message >= WM_KEYFIRST && pMsg->message <= WM_KEYLAST)
+			m_lastInputDevice = InputDevice::Keyboard;
+		else if(pMsg->message >= WM_MOUSEFIRST && pMsg->message <= WM_MOUSELAST)
+			m_lastInputDevice = InputDevice::Mouse;
+
+		if(HandleGlobalKeyMessage(*pMsg))
+			return TRUE;
+	}
 
 	return CDialog::PreTranslateMessage(pMsg);
 }

mptrack/DialogBase.h

@@ -18,6 +18,13 @@ OPENMPT_NAMESPACE_BEGIN
 class DialogBase : public CDialog
 {
 public:
+	enum class InputDevice : uint8
+	{
+		Unknown,
+		Mouse,
+		Keyboard,
+	};
+
 	using CDialog::CDialog;
 
 	BOOL OnInitDialog() override;
@@ -44,6 +51,8 @@ class DialogBase : public CDialog
 private:
 	CString m_tooltipText;
 	int m_dpi = 0;
+protected:
+	InputDevice m_lastInputDevice = InputDevice::Unknown;
 };
 
 OPENMPT_NAMESPACE_END

mptrack/Globals.cpp

@@ -67,17 +67,6 @@ CModControlDlg::~CModControlDlg()
 }
 
 
-BOOL CModControlDlg::PreTranslateMessage(MSG *pMsg)
-{
-	if(pMsg->message >= WM_KEYFIRST && pMsg->message <= WM_KEYLAST)
-		m_lastInputDevice = InputDevice::Keyboard;
-	else if(pMsg->message >= WM_MOUSEFIRST && pMsg->message <= WM_MOUSELAST)
-		m_lastInputDevice = InputDevice::Mouse;
-
-	return DialogBase::PreTranslateMessage(pMsg);
-}
-
-
 void CModControlDlg::OnSize(UINT nType, int cx, int cy)
 {
 	DialogBase::OnSize(nType, cx, cy);

mptrack/Globals.h

@@ -38,20 +38,12 @@ class CModControlBar: public CToolBarCtrl
 class CModControlDlg : public DialogBase
 {
 protected:
-	enum class InputDevice : uint8
-	{
-		Unknown,
-		Mouse,
-		Keyboard,
-	};
-
 	CModDoc &m_modDoc;
 	CSoundFile &m_sndFile;
 	CModControlView &m_parent;
 	HWND m_hWndView = nullptr;
 	HWND m_lastFocusItem = nullptr;
 	int m_nLockCount = 0;
-	InputDevice m_lastInputDevice = InputDevice::Unknown;
 	bool m_initialized = false;
 
 public:
@@ -87,7 +79,6 @@ class CModControlDlg : public DialogBase
 	afx_msg void OnSwitchToView();
 
 	//{{AFX_VIRTUAL(CModControlDlg)
-	BOOL PreTranslateMessage(MSG *pMsg) override;
 	void OnOK() override {}
 	void OnCancel() override {}
 	void OnDPIChanged() override { RecalcLayout(); }

mptrack/SampleEditorDialogs.cpp

@@ -490,14 +490,14 @@ BOOL AddSilenceDlg::OnInitDialog()
 {
 	DialogBase::OnInitDialog();
 
-	CSpinButtonCtrl *spin = (CSpinButtonCtrl *)GetDlgItem(IDC_SPIN_ADDSILENCE);
+	CSpinButtonCtrl *spin = static_cast<CSpinButtonCtrl *>(GetDlgItem(IDC_SPIN_ADDSILENCE));
 	if(spin)
 	{
 		spin->SetRange32(0, int32_max);
 		spin->SetPos32(m_numSamples);
 	}
 
-	CComboBox *box = (CComboBox *)GetDlgItem(IDC_COMBO1);
+	CComboBox *box = static_cast<CComboBox *>(GetDlgItem(IDC_COMBO1));
 	if(box)
 	{
 		box->AddString(_T("samples"));
@@ -790,6 +790,7 @@ bool CResamplingDlg::m_updatePatternNotes = false;
 
 BEGIN_MESSAGE_MAP(CResamplingDlg, DialogBase)
 	ON_EN_SETFOCUS(IDC_EDIT1, &CResamplingDlg::OnFocusEdit)
+	ON_EN_CHANGE(IDC_EDIT1,   &CResamplingDlg::OnEditChanged)
 END_MESSAGE_MAP()
 
 
@@ -891,7 +892,15 @@ void CResamplingDlg::OnOK()
 
 void CResamplingDlg::OnFocusEdit()
 {
-	CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3);
+	if(m_lastInputDevice == InputDevice::Mouse)
+		CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3);
+}
+
+
+void CResamplingDlg::OnEditChanged()
+{
+	if(m_lastInputDevice != InputDevice::Unknown)
+		CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3);
 }
 
 

mptrack/SampleEditorDialogs.h

@@ -246,6 +246,7 @@ class CResamplingDlg : public DialogBase
 	void OnOK() override;
 
 	afx_msg void OnFocusEdit();
+	afx_msg void OnEditChanged();
 
 	DECLARE_MESSAGE_MAP()
 };