[OMPT-svn-commit] OpenMPT r23107 - in branches/OpenMPT-1.32: . mptrack

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

Author: sagamusix
Date: Fri Mar 28 23:29:01 2025
New Revision: 23107
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23107

Log:
Merged revision(s) 23106 from trunk/OpenMPT:
[Fix] Pattenr tab: Toggling most toolbar buttons didn't dot anything when doing it via the keyboard (https://bugs.openmpt.org/view.php?id=1871).
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/mptrack/Ctrl_pat.cpp

Modified: branches/OpenMPT-1.32/mptrack/Ctrl_pat.cpp
==============================================================================
--- branches/OpenMPT-1.32/mptrack/Ctrl_pat.cpp	Fri Mar 28 23:28:39 2025	(r23106)
+++ branches/OpenMPT-1.32/mptrack/Ctrl_pat.cpp	Fri Mar 28 23:29:01 2025	(r23107)
@@ -114,7 +114,8 @@
 
 
 CCtrlPatterns::CCtrlPatterns(CModControlView &parent, CModDoc &document)
-    : CModControlDlg(parent, document), m_OrderList(*this, document)
+	: CModControlDlg{parent, document}
+	, m_OrderList{*this, document}
 {
 	m_BtnPrev.SetAccessibleText(_T("Select Previous Order"));
 	m_BtnNext.SetAccessibleText(_T("Select Next Order"));
@@ -1078,8 +1079,9 @@
 
 void CCtrlPatterns::OnPatternRecord()
 {
-	m_bRecord = m_ToolBar.IsButtonChecked(IDC_PATTERN_RECORD) != 0;
+	m_bRecord = !m_bRecord;
 	TrackerSettings::Instance().gbPatternRecord = m_bRecord;
+	m_ToolBar.CheckButton(IDC_PATTERN_RECORD, m_bRecord ? TRUE : FALSE);
 	SendViewMessage(VIEWMSG_SETRECORD, m_bRecord);
 	SwitchToView();
 }
@@ -1087,8 +1089,9 @@
 
 void CCtrlPatterns::OnPatternVUMeters()
 {
-	m_bVUMeters = m_ToolBar.IsButtonChecked(ID_PATTERN_VUMETERS) != 0;
-	TrackerSettings::Instance().gbPatternVUMeters = (m_bVUMeters != 0);
+	m_bVUMeters = !m_bVUMeters;
+	TrackerSettings::Instance().gbPatternVUMeters = m_bVUMeters;
+	m_ToolBar.CheckButton(ID_PATTERN_VUMETERS, m_bVUMeters ? TRUE : FALSE);
 	SendViewMessage(VIEWMSG_SETVUMETERS, m_bVUMeters);
 	SwitchToView();
 }
@@ -1096,8 +1099,9 @@
 
 void CCtrlPatterns::OnPatternViewPlugNames()
 {
-	m_bPluginNames = m_ToolBar.IsButtonChecked(ID_VIEWPLUGNAMES) != 0;
-	TrackerSettings::Instance().gbPatternPluginNames = (m_bPluginNames != 0);
+	m_bPluginNames = !m_bPluginNames;
+	TrackerSettings::Instance().gbPatternPluginNames = m_bPluginNames;
+	m_ToolBar.CheckButton(ID_VIEWPLUGNAMES, m_bPluginNames ? TRUE : FALSE);
 	SendViewMessage(VIEWMSG_SETPLUGINNAMES, m_bPluginNames);
 	SwitchToView();
 }
@@ -1113,8 +1117,7 @@
 
 void CCtrlPatterns::OnToggleMetronome()
 {
-	bool enableMetronome = m_ToolBar.IsButtonChecked(IDC_METRONOME) != 0;
-	TrackerSettings::Instance().metronomeEnabled = enableMetronome;
+	TrackerSettings::Instance().metronomeEnabled = !TrackerSettings::Instance().metronomeEnabled;
 	CMainFrame::GetMainFrame()->UpdateMetronomeSamples();
 	theApp.PostMessageToAllViews(WM_MOD_CTRLMSG, CTRLMSG_PAT_UPDATE_TOOLBAR);
 	SwitchToView();