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

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

Author: sagamusix
Date: Mon Nov 18 19:25:19 2024
New Revision: 22220
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22220

Log:
[Ref] Mainbar: Small cleanup.

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

Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp	Mon Nov 18 19:10:59 2024	(r22219)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp	Mon Nov 18 19:25:19 2024	(r22220)
@@ -33,11 +33,11 @@
 
 void COctaveEdit::OnChar(UINT nChar, UINT /*nRepCnt*/, UINT /*nFlags*/)
 {
-	if(nChar >= '0' + MIN_BASEOCTAVE && nChar <= '0' + MAX_BASEOCTAVE)
-		m_owner.SetBaseOctave(nChar - '0');
-	else if(nChar == '+' && m_owner.GetBaseOctave() < MAX_BASEOCTAVE)
+	if(nChar >= _T('0') + MIN_BASEOCTAVE && nChar <= _T('0') + MAX_BASEOCTAVE)
+		m_owner.SetBaseOctave(nChar - _T('0'));
+	else if(nChar == _T('+') && m_owner.GetBaseOctave() < MAX_BASEOCTAVE)
 		m_owner.SetBaseOctave(m_owner.GetBaseOctave() + 1);
-	else if(nChar == '-' && m_owner.GetBaseOctave() > MIN_BASEOCTAVE)
+	else if(nChar == _T('-') && m_owner.GetBaseOctave() > MIN_BASEOCTAVE)
 		m_owner.SetBaseOctave(m_owner.GetBaseOctave() - 1);
 }
 
@@ -483,19 +483,16 @@
 }
 
 
-BOOL CMainToolBar::SetBaseOctave(UINT nOctave)
+void CMainToolBar::SetBaseOctave(UINT octave)
 {
-	TCHAR s[64];
+	if(octave == static_cast<UINT>(m_currentOctave) || octave < MIN_BASEOCTAVE || octave > MAX_BASEOCTAVE)
+		return;
 
-	if((nOctave < MIN_BASEOCTAVE) || (nOctave > MAX_BASEOCTAVE)) return FALSE;
-	if(nOctave != (UINT)m_currentOctave)
-	{
-		m_currentOctave = nOctave;
-		wsprintf(s, _T("Octave %d"), nOctave);
-		m_EditOctave.SetWindowText(s);
-		m_SpinOctave.SetPos(nOctave);
-	}
-	return TRUE;
+	m_currentOctave = octave;
+	TCHAR s[32];
+	wsprintf(s, _T("Octave %d"), octave);
+	m_EditOctave.SetWindowText(s);
+	m_SpinOctave.SetPos(octave);
 }
 
 
@@ -533,6 +530,7 @@
 
 static void EnableEdit(CEdit &edit, CSpinButtonCtrl &spin, bool enable)
 {
+	// Avoid flicker when enabling / disabling controls
 	edit.SetRedraw(FALSE);
 	if(!enable)
 		edit.SetWindowText(_T("---"));

Modified: trunk/OpenMPT/mptrack/Mainbar.h
==============================================================================
--- trunk/OpenMPT/mptrack/Mainbar.h	Mon Nov 18 19:10:59 2024	(r22219)
+++ trunk/OpenMPT/mptrack/Mainbar.h	Mon Nov 18 19:25:19 2024	(r22220)
@@ -133,7 +133,7 @@
 #endif // MPT_COMPILER_CLANG
 	void Init(CMainFrame *);
 	UINT GetBaseOctave() const;
-	BOOL SetBaseOctave(UINT nOctave);
+	void SetBaseOctave(UINT nOctave);
 	void SetCurrentSong(CSoundFile *pModDoc);
 
 	bool ShowUpdateInfo(const CString &newVersion, const CString &infoURL, bool showHighLight);