[Imp] When displaying the volume column in hex, also show the effect …

…info for it in hex. git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22438 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Dec 1, 2024 · 3a32192 · 3a32192
1 parent 1221be0
commit 3a32192
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/mptrack/Draw_pat.cpp b/mptrack/Draw_pat.cpp
@@ -1776,7 +1776,7 @@ CString CViewPattern::GetCursorDescription() const
 			effectInfo.GetVolCmdInfo(effectInfo.GetIndexFromVolCmd(m->volcmd), &s);
 			s += _T(": ");
 			CString tmp;
-			effectInfo.GetVolCmdParamInfo(*m, &tmp);
+			effectInfo.GetVolCmdParamInfo(*m, &tmp, TrackerSettings::Instance().patternVolColHex);
 			s += tmp;
 		}
 		break;

diff --git a/mptrack/EffectInfo.cpp b/mptrack/EffectInfo.cpp
@@ -1026,11 +1026,18 @@ bool EffectInfo::GetVolCmdInfo(UINT ndx, CString *s, ModCommand::VOL *prangeMin,
 }
 
 
-bool EffectInfo::GetVolCmdParamInfo(const ModCommand &m, CString *s) const
+bool EffectInfo::GetVolCmdParamInfo(const ModCommand &m, CString *s, bool hex) const
 {
-	if(s == nullptr) return false;
+	if(s == nullptr)
+		return false;
 	s->Empty();
 
+	CString volume;
+	if(hex)
+		volume = mpt::cfmt::HEX(m.vol);
+	else
+		volume = mpt::cfmt::dec(m.vol);
+
 	switch(m.volcmd)
 	{
 	case VOLCMD_PANNING:
@@ -1043,9 +1050,8 @@ bool EffectInfo::GetVolCmdParamInfo(const ModCommand &m, CString *s) const
 	case VOLCMD_FINEVOLDOWN:
 		if(m.vol > 0 || sndFile.GetType() == MOD_TYPE_XM)
 		{
-			s->Format(_T("%c%u"),
-				(m.volcmd == VOLCMD_VOLSLIDEUP || m.volcmd == VOLCMD_FINEVOLUP) ? _T('+') : _T('-'),
-				m.vol);
+			*s = (m.volcmd == VOLCMD_VOLSLIDEUP || m.volcmd == VOLCMD_FINEVOLUP) ? _T('+') : _T('-')
+				+ volume;
 		} else
 		{
 			*s = _T("continue");
@@ -1068,8 +1074,8 @@ bool EffectInfo::GetVolCmdParamInfo(const ModCommand &m, CString *s) const
 				if(sndFile.GetType() != MOD_TYPE_XM) param = ImpulseTrackerPortaVolCmd[m.vol & 0x0F];
 				else param = m.vol << 4;
 			}
-			s->Format(_T("%u (%c%02X)"),
-				m.vol,
+			*s = volume;
+			s->AppendFormat(_T(" (%c%02X)"),
 				sndFile.GetModSpecifications().GetEffectLetter(cmd),
 				param);
 		} else
@@ -1113,7 +1119,7 @@ bool EffectInfo::GetVolCmdParamInfo(const ModCommand &m, CString *s) const
 		break;
 
 	default:
-		s->Format(_T("%u"), m.vol);
+		*s = volume;
 		break;
 	}
 	return true;

diff --git a/mptrack/EffectInfo.h b/mptrack/EffectInfo.h
@@ -61,7 +61,7 @@ class EffectInfo
 	// Get range information, effect name, etc... from a given effect.
 	bool GetVolCmdInfo(UINT ndx, CString *s, ModCommand::VOL *prangeMin = nullptr, ModCommand::VOL *prangeMax = nullptr) const;
 	// Get effect name and parameter description
-	bool GetVolCmdParamInfo(const ModCommand &m, CString *s) const;
+	bool GetVolCmdParamInfo(const ModCommand &m, CString *s, bool hex) const;
 	// Map an effect value to slider position
 	UINT MapVolumeToPos(VolumeCommand cmd, ModCommand::VOL param) const;
 	// Map slider position to an effect value

diff --git a/mptrack/PatternEditorDialogs.cpp b/mptrack/PatternEditorDialogs.cpp
@@ -829,7 +829,7 @@ void CEditCommand::UpdateVolCmdValue()
 	} else
 	{
 		// process as effect
-		effectInfo.GetVolCmdParamInfo(*m, &s);
+		effectInfo.GetVolCmdParamInfo(*m, &s, TrackerSettings::Instance().patternVolColHex);
 	}
 	SetDlgItemText(IDC_TEXT2, s);
 }