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

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

Author: sagamusix
Date: Fri Nov  8 22:53:21 2024
New Revision: 22116
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22116

Log:
[Imp] Add hidden setting "Pattern Editor.AutoHideVolumeColumnForMOD". This is not applied to formats that are imported as MOD, because they might still be using the volume column (https://bugs.openmpt.org/view.php?id=1836).

Modified:
   trunk/OpenMPT/mptrack/Childfrm.h
   trunk/OpenMPT/mptrack/TrackerSettings.cpp
   trunk/OpenMPT/mptrack/TrackerSettings.h
   trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/Childfrm.h
==============================================================================
--- trunk/OpenMPT/mptrack/Childfrm.h	Fri Nov  8 22:31:04 2024	(r22115)
+++ trunk/OpenMPT/mptrack/Childfrm.h	Fri Nov  8 22:53:21 2024	(r22116)
@@ -42,7 +42,7 @@
 	PatternRect selection;
 	ORDERINDEX nOrder = 0;
 	ORDERINDEX initialOrder = ORDERINDEX_INVALID;
-	std::bitset<PatternCursor::numColumns> visibleColumns = std::bitset<PatternCursor::numColumns>{}.set();
+	std::bitset<PatternCursor::numColumns> visibleColumns;
 	bool initialized = false;
 
 	std::string Serialize() const;

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	Fri Nov  8 22:31:04 2024	(r22115)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	Fri Nov  8 22:53:21 2024	(r22116)
@@ -1,7 +1,7 @@
 /*
  * TrackerSettings.cpp
  * -------------------
- * Purpose: Code for managing, loading and saving all applcation settings.
+ * Purpose: Code for managing, loading and saving all application settings.
  * Notes  : (currently none)
  * Authors: Olivier Lapicque
  *          OpenMPT Devs
@@ -281,6 +281,7 @@
 	, patternAccessibilityFormat(conf, UL_("Pattern Editor"), UL_("AccessibilityFormat"), _T("Row %row%, Channel %channel%, %column_type%: %column_description%"))
 	, patternAlwaysDrawWholePatternOnScrollSlow(conf, UL_("Pattern Editor"), UL_("AlwaysDrawWholePatternOnScrollSlow"), false)
 	, orderListOldDropBehaviour(conf, UL_("Pattern Editor"), UL_("OrderListOldDropBehaviour"), false)
+	, autoHideVolumeColumnForMOD(conf, UL_("Pattern Editor"), UL_("AutoHideVolumeColumnForMOD"), false)
 	// Sample Editor
 	, m_SampleUndoBufferSize(conf, UL_("Sample Editor"), UL_("UndoBufferSize"), SampleUndoBufferSize())
 	, sampleEditorKeyBehaviour(conf, UL_("Sample Editor"), UL_("KeyBehaviour"), seNoteOffOnNewKey)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	Fri Nov  8 22:31:04 2024	(r22115)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	Fri Nov  8 22:53:21 2024	(r22116)
@@ -808,6 +808,7 @@
 	Setting<CString> patternAccessibilityFormat;
 	CachedSetting<bool> patternAlwaysDrawWholePatternOnScrollSlow;
 	CachedSetting<bool> orderListOldDropBehaviour;
+	Setting<bool> autoHideVolumeColumnForMOD;
 
 	// Sample Editor
 

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Fri Nov  8 22:31:04 2024	(r22115)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Fri Nov  8 22:53:21 2024	(r22116)
@@ -201,6 +201,11 @@
 	m_nLastPlayedRow = 0;
 	m_nLastPlayedOrder = ORDERINDEX_INVALID;
 	m_prevChordNote = NOTE_NONE;
+
+	m_visibleColumns.set();
+	CModDoc *modDoc = GetDocument();
+	if(modDoc->GetModType() == MOD_TYPE_MOD && !modDoc->GetSoundFile().m_SongFlags[SONG_IMPORTED] && TrackerSettings::Instance().autoHideVolumeColumnForMOD)
+		m_visibleColumns.reset(PatternCursor::volumeColumn);
 }
 
 
@@ -4208,7 +4213,8 @@
 		if(lParam)
 		{
 			PatternViewState *pState = (PatternViewState *)lParam;
-			UpdateVisibileColumns(pState->visibleColumns);
+			if(pState->visibleColumns.any())
+				UpdateVisibileColumns(pState->visibleColumns);
 			if(pState->initialized)
 			{
 				SetCurrentPattern(pState->nPattern);