Prevent focus shifting with open instrument editor

- This fixes #350.

Author: Gumball2415

Source/InstrumentEditDlg.cpp

@@ -165,7 +165,7 @@ void CInstrumentEditDlg::ClearPanels()
 	m_iInstrument = -1;
 }
 
-void CInstrumentEditDlg::SetCurrentInstrument(int Index)
+void CInstrumentEditDlg::SetCurrentInstrument(int Index, bool Focus)
 {
 	CFamiTrackerDoc *pDoc = CFamiTrackerDoc::GetDoc();
 	std::shared_ptr<CInstrument> pInstrument = pDoc->GetInstrument(Index);
@@ -220,6 +220,7 @@ void CInstrumentEditDlg::SetCurrentInstrument(int Index)
 	for (int i = 0; i < PANEL_COUNT; ++i) {
 		if (m_pPanels[i] != NULL) {
 			m_pPanels[i]->SelectInstrument(pInstrument);
+			if (Focus) m_pPanels[i]->SetFocus();
 		}
 	}
 

Source/InstrumentEditDlg.h

@@ -34,7 +34,7 @@ class CInstrumentEditDlg : public CDialog
 	virtual ~CInstrumentEditDlg();
 
 	void ChangeNoteState(int Note);
-	void SetCurrentInstrument(int Index);
+	void SetCurrentInstrument(int Index, bool Focus = true);
 	float GetRefreshRate() const;		// // //
 	void SetRefreshRate(float Rate);		// // //
 	bool IsOpened() const;

Source/InstrumentEditorSeq.cpp

@@ -75,8 +75,6 @@ void CInstrumentEditorSeq::SelectInstrument(std::shared_ptr<CInstrument> pInst)
 	SetDlgItemInt(IDC_SEQ_INDEX, m_pInstrument->GetSeqIndex(m_iSelectedSetting = Sel));
 
 	SelectSequence(m_pInstrument->GetSeqIndex(m_iSelectedSetting), m_iSelectedSetting);
-
-	SetFocus();
 }
 
 void CInstrumentEditorSeq::SelectSequence(int Sequence, int Type)

Source/MainFrm.cpp

@@ -995,7 +995,8 @@ void CMainFrame::SelectInstrument(int Index)
 
 		// Update instrument editor
 		if (m_wndInstEdit.IsOpened())
-			m_wndInstEdit.SetCurrentInstrument(Index);
+			// Do not shift focus when selecting the instrument due to a instrument column edit
+			m_wndInstEdit.SetCurrentInstrument(Index, false);
 	}
 	else {
 		// Remove selection