ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Debugger] CPU Log: fix wrong indeces after scrolling

This commit is contained in:
shygoo 2019-01-14 05:11:15 -06:00
parent 4d322191c2
commit 12b97b83d8
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Project64/UserInterface/Debugger/Debugger-CPULogView.cpp
View File

@ -10,7 +10,9 @@ HHOOK CDebugCPULogView::hWinMessageHook = NULL;
CDebugCPULogView::CDebugCPULogView(CDebuggerUI* debugger) :
CDebugDialog<CDebugCPULogView>(debugger),
m_CPULogCopy(NULL)
m_CPULogCopy(NULL),
m_LogStartIndex(0),
m_RowHeight(13)
{
}
@ -137,7 +139,9 @@ LRESULT CDebugCPULogView::OnListItemChanged(NMHDR* pNMHDR)
{
NMITEMACTIVATE* pIA = reinterpret_cast<NMITEMACTIVATE*>(pNMHDR);
int nItem = pIA->iItem;
ShowRegStates(nItem);
ShowRegStates(m_LogStartIndex + nItem);
return FALSE;
}
@ -146,7 +150,7 @@ LRESULT CDebugCPULogView::OnListDblClicked(NMHDR* pNMHDR)
NMITEMACTIVATE* pIA = reinterpret_cast<NMITEMACTIVATE*>(pNMHDR);
int nItem = pIA->iItem;
CPUState* state = m_CPULogCopy->GetEntry(nItem);
CPUState* state = m_CPULogCopy->GetEntry(m_LogStartIndex + nItem);
if (state == NULL)
{
@ -197,7 +201,8 @@ LRESULT CDebugCPULogView::OnScroll(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam,
default: return 0;
}
::SetScrollPos(hScrollbar, SB_CTL, newPos, TRUE);
m_LogStartIndex = newPos;
::SetScrollPos(hScrollbar, SB_CTL, m_LogStartIndex, TRUE);
if (scrlId == IDC_SCRL_BAR)
{
@ -215,7 +220,8 @@ void CDebugCPULogView::InterceptMouseWheel(WPARAM wParam, LPARAM lParam)
{
// scroll results list
int scrollPos = m_Scrollbar.GetScrollPos();
m_Scrollbar.SetScrollPos(scrollPos + nScroll);
int m_ListStartIndex = scrollPos + nScroll;
m_Scrollbar.SetScrollPos(m_ListStartIndex);
RefreshList(false);
}
}
@ -276,7 +282,8 @@ void CDebugCPULogView::RefreshList(bool bUpdateBuffer)
if (bUpdateBuffer)
{
m_Scrollbar.SetScrollPos(scrollRangeMax, true);
m_LogStartIndex = scrollRangeMax;
m_Scrollbar.SetScrollPos(m_LogStartIndex, true);
}
size_t start = m_Scrollbar.GetScrollPos();

3
Source/Project64/UserInterface/Debugger/Debugger-CPULogView.h
View File

@ -20,6 +20,7 @@ private:
CCPULog* m_CPULogCopy;
int m_RowHeight;
int m_LogStartIndex;
CListViewCtrl m_CPUListView;
CEdit m_StateInfoEdit;
@ -37,7 +38,7 @@ private:
LRESULT OnScroll(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
void OnExitSizeMove(void);
LRESULT OnDestroy(void);
void InterceptMouseWheel(WPARAM wParam, LPARAM lParam);