[OMPT-svn-commit] OpenMPT r22240 - in branches/OpenMPT-1.31: . mptrack

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

Author: sagamusix
Date: Tue Nov 19 18:55:27 2024
New Revision: 22240
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22240

Log:
Merged revision(s) 22239 from trunk/OpenMPT:
[Imp] Instrument tab: Show tooltips for disabled envelope toolbar buttons, and show the button name in the toolbar.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/View_ins.cpp

Modified: branches/OpenMPT-1.31/mptrack/View_ins.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_ins.cpp	Tue Nov 19 18:55:01 2024	(r22239)
+++ branches/OpenMPT-1.31/mptrack/View_ins.cpp	Tue Nov 19 18:55:27 2024	(r22240)
@@ -786,7 +786,7 @@
 	GetWindowRect(&rcWnd);
 	for(UINT i = 0; i < ENV_LEFTBAR_BUTTONS; i++)
 	{
-		if(!(m_NcButtonState[i] & NCBTNS_DISABLED) && GetNcButtonRect(i, rect))
+		if(GetNcButtonRect(i, rect))
 		{
 			rect.OffsetRect(rcWnd.left, rcWnd.top);
 			if(rect.PtInRect(point))
@@ -836,7 +836,7 @@
 		case ID_ENVELOPE_LOAD:
 		case ID_ENVELOPE_SAVE:     if(GetInstrumentPtr() == nullptr) dwStyle |= NCBTNS_DISABLED; break;
 		}
-		if (m_nBtnMouseOver == i)
+		if (m_nBtnMouseOver == i && !(m_NcButtonState[i] & NCBTNS_DISABLED))
 		{
 			dwStyle |= NCBTNS_MOUSEOVER;
 			if (m_dwStatus & INSSTATUS_NCLBTNDOWN) dwStyle |= NCBTNS_PUSHED;
@@ -1400,7 +1400,7 @@
 
 void CViewInstrument::OnNcLButtonDown(UINT uFlags, CPoint point)
 {
-	if(m_nBtnMouseOver < ENV_LEFTBAR_BUTTONS)
+	if(m_nBtnMouseOver < ENV_LEFTBAR_BUTTONS && !(m_NcButtonState[m_nBtnMouseOver] & NCBTNS_DISABLED))
 	{
 		m_dwStatus |= INSSTATUS_NCLBTNDOWN;
 		if(cLeftBarButtons[m_nBtnMouseOver] != ID_SEPARATOR)
@@ -2852,7 +2852,11 @@
 	pTI->hwnd = m_hWnd;
 	pTI->uId = buttonID;
 	pTI->rect = ncRect;
-	CString text = LoadResourceString(buttonID);
+	CString text;
+	if(m_NcButtonState[ncButton] & NCBTNS_DISABLED)
+		text = MPT_CFORMAT("Feature is not available in the {} format.")(mpt::ToCString(GetDocument()->GetSoundFile().GetModSpecifications().GetFileExtensionUpper()));
+	else
+		text = LoadResourceString(buttonID);
 
 	CommandID cmd = kcNull;
 	switch(buttonID)
@@ -2873,7 +2877,7 @@
 	case ID_ENVELOPE_LOAD: cmd = kcInstrumentEnvelopeLoad; break;
 	case ID_ENVELOPE_SAVE: cmd = kcInstrumentEnvelopeSave; break;
 	}
-	if(cmd != kcNull)
+	if(cmd != kcNull && !(m_NcButtonState[ncButton] & NCBTNS_DISABLED))
 	{
 		auto keyText = CMainFrame::GetInputHandler()->m_activeCommandSet->GetKeyTextFromCommand(cmd, 0);
 		if(!keyText.IsEmpty())