From: <sv...@op...> - 2024-06-28 20:05:42
|
Author: sagamusix Date: Fri Jun 28 22:05:29 2024 New Revision: 21095 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21095 Log: [Fix] Sample tab: Don't allow OPL editor to remain focussed when switching to a non-OPL sample slot (https://bugs.openmpt.org/view.php?id=1795). Modified: trunk/OpenMPT/mptrack/View_smp.cpp Modified: trunk/OpenMPT/mptrack/View_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_smp.cpp Fri Jun 28 21:12:35 2024 (r21094) +++ trunk/OpenMPT/mptrack/View_smp.cpp Fri Jun 28 22:05:29 2024 (r21095) @@ -415,7 +415,10 @@ if(!IsOPLInstrument()) { if(m_oplEditor) + { m_oplEditor->ShowWindow(SW_HIDE); + m_oplEditor->EnableWindow(FALSE); + } return; } CSoundFile &sndFile = GetDocument()->GetSoundFile(); @@ -435,6 +438,7 @@ if(m_oplEditor) { m_oplEditor->SetPatch(sample.adlib); + m_oplEditor->EnableWindow(TRUE); auto size = m_oplEditor->GetMinimumSize(); m_oplEditor->SetWindowPos(nullptr, -m_nScrollPosX, -m_nScrollPosY, std::max(size.cx, m_rcClient.right), std::max(size.cy, m_rcClient.bottom), SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW); } |