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

Debugger: Don't modify disassembly focus on CPU state change

This commit is contained in:
Ty Lamontagne 2023-12-14 14:40:23 -05:00 committed by refractionpcsx2
parent a7271697a2
commit 20c3178dfe
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2-qt/Debugger/CpuWidget.cpp
View File

@ -262,7 +262,7 @@ void CpuWidget::onVMPaused()
}
else
{
m_ui.disassemblyWidget->gotoAddress(m_cpu.getPC());
m_ui.disassemblyWidget->gotoAddress(m_cpu.getPC(), false);
}
reloadCPUWidgets();
@ -501,7 +501,7 @@ void CpuWidget::contextRemoveSearchResult()
const int selectedResultIndex = m_ui.listSearchResults->row(m_ui.listSearchResults->selectedItems().first());
auto* rowToRemove = m_ui.listSearchResults->takeItem(selectedResultIndex);
if (m_searchResults.size() > selectedResultIndex && m_searchResults.at(selectedResultIndex) == rowToRemove->data(256).toUInt())
if (m_searchResults.size() > static_cast<size_t>(selectedResultIndex) && m_searchResults.at(selectedResultIndex) == rowToRemove->data(256).toUInt())
{
m_searchResults.erase(m_searchResults.begin() + selectedResultIndex);
}

5
pcsx2-qt/Debugger/DisassemblyWidget.cpp
View File

@ -837,7 +837,7 @@ QString DisassemblyWidget::FetchSelectionInfo(SelectionInfo selInfo)
return infoBlock;
}
void DisassemblyWidget::gotoAddress(u32 address)
void DisassemblyWidget::gotoAddress(u32 address, bool should_set_focus)
{
const u32 destAddress = address & ~3;
// Center the address
@ -846,7 +846,8 @@ void DisassemblyWidget::gotoAddress(u32 address)
m_selectedAddressEnd = destAddress;
this->repaint();
this->setFocus();
if(should_set_focus)
this->setFocus();
}
bool DisassemblyWidget::AddressCanRestore(u32 start, u32 end)

2
pcsx2-qt/Debugger/DisassemblyWidget.h
View File

@ -69,7 +69,7 @@ public slots:
void contextStubFunction();
void contextRestoreFunction();
void gotoAddress(u32 address);
void gotoAddress(u32 address, bool should_set_focus = true);
void setDemangle(bool demangle) { m_demangleFunctions = demangle; };
signals:

2
pcsx2-qt/Debugger/MemoryViewWidget.h
View File

@ -115,7 +115,7 @@ public slots:
void gotoAddress(u32 address);
signals:
void gotoInDisasm(u32 address);
void gotoInDisasm(u32 address, bool should_set_focus = true);
void VMUpdate();
private:

2
pcsx2-qt/Debugger/RegisterWidget.h
View File

@ -57,7 +57,7 @@ public slots:
void tabCurrentChanged(int cur);
signals:
void gotoInDisasm(u32 address);
void gotoInDisasm(u32 address, bool should_set_focus = true);
void gotoInMemory(u32 address);
void VMUpdate();