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

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

Author: sagamusix
Date: Mon Nov 11 23:14:22 2024
New Revision: 22164
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22164

Log:
[Mod] Main toolbar: Give keyboard focus back to last active view after using spinners, like it used to work before.

Modified:
   trunk/OpenMPT/mptrack/Mainbar.cpp

Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp	Mon Nov 11 23:00:20 2024	(r22163)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp	Mon Nov 11 23:14:22 2024	(r22164)
@@ -609,7 +609,10 @@
 
 	CToolBarEx::OnVScroll(nCode, nPos, pScrollBar);
 	// Avoid auto-setting input focus to edit control
-	pScrollBar->SetFocus();
+	if(auto *activeView = CMainFrame::GetMainFrame()->GetActiveView(); activeView != nullptr)
+		activeView->SetFocus();
+	else
+		pScrollBar->SetFocus();
 
 	short int oct = (short int)m_SpinOctave.GetPos();
 	if((oct >= MIN_BASEOCTAVE) && ((int)oct != m_currentOctave))