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

BranchWatchDialog: Refactor Context Menus 

Instead of one wildly complex context menu constructed lazily, now three manageable context menus are constructed proactively.
This commit is contained in:
mitaclaw 2024-08-05 21:34:10 -07:00
parent 107c08b77f
commit 7ce703a4a8
2 changed files with 112 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp
View File

@ -34,6 +34,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IOFile.h" #include "Common/IOFile.h"
#include "Common/Unreachable.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Debugger/BranchWatch.h" #include "Core/Debugger/BranchWatch.h"
@ -414,6 +415,38 @@ BranchWatchDialog::BranchWatchDialog(Core::System& system, Core::BranchWatch& br
m_control_toolbar->addWidget(group_box); m_control_toolbar->addWidget(group_box);
} }
// Table Context Menus
auto* const delete_action = new QAction(tr("&Delete"), this);
connect(delete_action, &QAction::triggered, this, &BranchWatchDialog::OnTableDelete);
m_act_copy_address = new QAction(tr("&Copy Address"), this);
connect(m_act_copy_address, &QAction::triggered, this, &BranchWatchDialog::OnTableCopyAddress);
m_act_insert_nop = new QAction(tr("Insert &NOP"), this);
connect(m_act_insert_nop, &QAction::triggered, this, &BranchWatchDialog::OnTableSetNOP);
m_act_insert_blr = new QAction(tr("Insert &BLR"), this);
connect(m_act_insert_blr, &QAction::triggered, this, &BranchWatchDialog::OnTableSetBLR);
m_mnu_set_breakpoint = new QMenu(tr("Set Brea&kpoint"), this);
m_act_break_on_hit = m_mnu_set_breakpoint->addAction(
tr("&Break on Hit"), this, &BranchWatchDialog::OnTableSetBreakpointBreak);
m_act_log_on_hit = m_mnu_set_breakpoint->addAction(tr("&Log on Hit"), this,
&BranchWatchDialog::OnTableSetBreakpointLog);
m_act_both_on_hit = m_mnu_set_breakpoint->addAction(tr("Break &and Log on Hit"), this,
&BranchWatchDialog::OnTableSetBreakpointBoth);
m_mnu_table_context_origin = new QMenu(this);
m_mnu_table_context_origin->addActions(
{delete_action, m_act_insert_nop, m_act_copy_address, m_mnu_set_breakpoint->menuAction()});
m_mnu_table_context_destin_or_symbol = new QMenu(this);
m_mnu_table_context_destin_or_symbol->addActions(
{delete_action, m_act_insert_blr, m_act_copy_address, m_mnu_set_breakpoint->menuAction()});
m_mnu_table_context_other = new QMenu(this);
m_mnu_table_context_other->addAction(delete_action);
LoadQSettings(); LoadQSettings();
// Column Visibility Menu // Column Visibility Menu
@ -1040,112 +1073,88 @@ void BranchWatchDialog::SetBreakpoints(bool break_on_hit, bool log_on_hit) const
m_code_widget->Update(); m_code_widget->Update();
} }
QMenu* BranchWatchDialog::GetTableContextMenu(const QModelIndex& index) void BranchWatchDialog::SetBreakpointMenuActionsIcons() const
{ {
if (m_mnu_table_context == nullptr) qsizetype bp_break_count = 0, bp_log_count = 0, bp_both_count = 0;
for (auto& breakpoints = m_system.GetPowerPC().GetBreakPoints();
const QModelIndex& index : m_index_list_temp)
{ {
m_mnu_table_context = new QMenu(this); if (const TBreakPoint* bp = breakpoints.GetRegularBreakpoint(
m_mnu_table_context->addAction(tr("&Delete"), this, &BranchWatchDialog::OnTableDelete); m_table_proxy->data(index, UserRole::ClickRole).value<u32>()))
m_act_insert_nop = {
m_mnu_table_context->addAction(tr("Insert &NOP"), this, &BranchWatchDialog::OnTableSetNOP); if (bp->break_on_hit && bp->log_on_hit)
m_act_insert_blr = {
m_mnu_table_context->addAction(tr("Insert &BLR"), this, &BranchWatchDialog::OnTableSetBLR); bp_both_count += 1;
m_act_copy_address = m_mnu_table_context->addAction(tr("&Copy Address"), this, continue;
&BranchWatchDialog::OnTableCopyAddress); }
bp_break_count += bp->break_on_hit;
m_mnu_set_breakpoint = new QMenu(tr("Set Brea&kpoint"), this); bp_log_count += bp->log_on_hit;
m_act_break_on_hit = m_mnu_set_breakpoint->addAction( }
tr("&Break on Hit"), this, &BranchWatchDialog::OnTableSetBreakpointBreak);
m_act_log_on_hit = m_mnu_set_breakpoint->addAction(tr("&Log on Hit"), this,
&BranchWatchDialog::OnTableSetBreakpointLog);
m_act_both_on_hit = m_mnu_set_breakpoint->addAction(
tr("Break &and Log on Hit"), this, &BranchWatchDialog::OnTableSetBreakpointBoth);
m_mnu_table_context->addMenu(m_mnu_set_breakpoint);
} }
const qsizetype selected_row_count = m_index_list_temp.size();
m_act_break_on_hit->setIconVisibleInMenu(bp_break_count != 0);
m_act_break_on_hit->setIcon(bp_break_count == selected_row_count ? m_icn_full : m_icn_partial);
m_act_log_on_hit->setIconVisibleInMenu(bp_log_count != 0);
m_act_log_on_hit->setIcon(bp_log_count == selected_row_count ? m_icn_full : m_icn_partial);
m_act_both_on_hit->setIconVisibleInMenu(bp_both_count != 0);
m_act_both_on_hit->setIcon(bp_both_count == selected_row_count ? m_icn_full : m_icn_partial);
}
QMenu* BranchWatchDialog::GetTableContextMenu(const QModelIndex& index) const
{
const bool core_initialized = Core::GetState(m_system) != Core::State::Uninitialized; const bool core_initialized = Core::GetState(m_system) != Core::State::Uninitialized;
bool supported_column = true;
switch (index.column()) switch (index.column())
{ {
case Column::Instruction:
case Column::Condition:
return m_mnu_table_context_other;
case Column::Origin: case Column::Origin:
m_act_insert_blr->setVisible(false); return GetTableContextMenu_Origin(core_initialized);
m_act_insert_nop->setVisible(true);
m_act_insert_nop->setEnabled(core_initialized);
m_act_copy_address->setEnabled(true);
m_mnu_set_breakpoint->setEnabled(true);
break;
case Column::Destination: case Column::Destination:
{ return GetTableContextMenu_Destin(core_initialized);
m_act_insert_nop->setVisible(false); case Column::RecentHits:
m_act_insert_blr->setVisible(true); case Column::TotalHits:
const bool all_branches_save_lr = return m_mnu_table_context_other;
core_initialized &&
std::all_of(
m_index_list_temp.begin(), m_index_list_temp.end(), [this](const QModelIndex& idx) {
const QModelIndex sibling = idx.siblingAtColumn(Column::Instruction);
return BranchSavesLR(m_table_proxy->data(sibling, UserRole::ClickRole).value<u32>());
});
m_act_insert_blr->setEnabled(all_branches_save_lr);
m_act_copy_address->setEnabled(true);
m_mnu_set_breakpoint->setEnabled(true);
break;
}
case Column::OriginSymbol: case Column::OriginSymbol:
case Column::DestinSymbol: case Column::DestinSymbol:
{ return GetTableContextMenu_Symbol(core_initialized);
m_act_insert_nop->setVisible(false);
m_act_insert_blr->setVisible(true);
const bool all_symbols_valid =
core_initialized &&
std::all_of(m_index_list_temp.begin(), m_index_list_temp.end(),
[this](const QModelIndex& idx) {
return m_table_proxy->data(idx, UserRole::ClickRole).isValid();
});
m_act_insert_blr->setEnabled(all_symbols_valid);
m_act_copy_address->setEnabled(all_symbols_valid);
m_mnu_set_breakpoint->setEnabled(all_symbols_valid);
break;
} }
default: static_assert(Column::NumberOfColumns == 8);
m_act_insert_nop->setVisible(false); Common::Unreachable();
m_act_insert_blr->setVisible(false); }
supported_column = false;
break; QMenu* BranchWatchDialog::GetTableContextMenu_Origin(bool core_initialized) const
} {
m_act_copy_address->setVisible(supported_column); SetBreakpointMenuActionsIcons();
m_mnu_set_breakpoint->menuAction()->setVisible(supported_column); m_act_insert_nop->setEnabled(core_initialized);
// Setting breakpoints while nothing is being emulated is discouraged in the UI. m_act_copy_address->setEnabled(true);
m_mnu_set_breakpoint->setEnabled(core_initialized); m_mnu_set_breakpoint->setEnabled(true);
return m_mnu_table_context_origin;
if (core_initialized && supported_column) }
{
qsizetype bp_break_count = 0, bp_log_count = 0, bp_both_count = 0; QMenu* BranchWatchDialog::GetTableContextMenu_Destin(bool core_initialized) const
for (auto& breakpoints = m_system.GetPowerPC().GetBreakPoints(); {
const QModelIndex& idx : m_index_list_temp) SetBreakpointMenuActionsIcons();
{ const bool all_branches_save_lr = // Taking advantage of short-circuit evaluation here.
if (const TBreakPoint* bp = breakpoints.GetRegularBreakpoint( core_initialized && std::ranges::all_of(m_index_list_temp, [this](const QModelIndex& index) {
m_table_proxy->data(idx, UserRole::ClickRole).value<u32>())) const QModelIndex sibling = index.siblingAtColumn(Column::Instruction);
{ return BranchSavesLR(m_table_proxy->data(sibling, UserRole::ClickRole).value<u32>());
if (bp->break_on_hit && bp->log_on_hit) });
{ m_act_insert_blr->setEnabled(all_branches_save_lr);
bp_both_count += 1; m_act_copy_address->setEnabled(true);
continue; m_mnu_set_breakpoint->setEnabled(true);
} return m_mnu_table_context_destin_or_symbol;
bp_break_count += bp->break_on_hit; }
bp_log_count += bp->log_on_hit;
} QMenu* BranchWatchDialog::GetTableContextMenu_Symbol(bool core_initialized) const
} {
m_act_break_on_hit->setIconVisibleInMenu(bp_break_count != 0); SetBreakpointMenuActionsIcons();
m_act_break_on_hit->setIcon(bp_break_count == m_index_list_temp.size() ? m_icn_full : const bool all_symbols_valid =
m_icn_partial); std::ranges::all_of(m_index_list_temp, [this](const QModelIndex& index) {
m_act_log_on_hit->setIconVisibleInMenu(bp_log_count != 0); return m_table_proxy->data(index, UserRole::ClickRole).isValid();
m_act_log_on_hit->setIcon(bp_log_count == m_index_list_temp.size() ? m_icn_full : });
m_icn_partial); m_act_insert_blr->setEnabled(core_initialized && all_symbols_valid);
m_act_both_on_hit->setIconVisibleInMenu(bp_both_count != 0); m_act_copy_address->setEnabled(all_symbols_valid);
m_act_both_on_hit->setIcon(bp_both_count == m_index_list_temp.size() ? m_icn_full : m_mnu_set_breakpoint->setEnabled(all_symbols_valid);
m_icn_partial); return m_mnu_table_context_destin_or_symbol;
}
return m_mnu_table_context;
} }

9
Source/Core/DolphinQt/Debugger/BranchWatchDialog.h
View File

@ -118,7 +118,11 @@ private:
void SetStubPatches(u32 value) const; void SetStubPatches(u32 value) const;
void SetBreakpoints(bool break_on_hit, bool log_on_hit) const; void SetBreakpoints(bool break_on_hit, bool log_on_hit) const;
[[nodiscard]] QMenu* GetTableContextMenu(const QModelIndex& index); void SetBreakpointMenuActionsIcons() const;
QMenu* GetTableContextMenu(const QModelIndex& index) const;
QMenu* GetTableContextMenu_Origin(bool core_initialized) const;
QMenu* GetTableContextMenu_Destin(bool core_initialized) const;
QMenu* GetTableContextMenu_Symbol(bool core_initialized) const;
Core::System& m_system; Core::System& m_system;
Core::BranchWatch& m_branch_watch; Core::BranchWatch& m_branch_watch;
@ -134,7 +138,8 @@ private:
QAction* m_act_break_on_hit; QAction* m_act_break_on_hit;
QAction* m_act_log_on_hit; QAction* m_act_log_on_hit;
QAction* m_act_both_on_hit; QAction* m_act_both_on_hit;
QMenu* m_mnu_table_context = nullptr; QMenu *m_mnu_table_context_origin, *m_mnu_table_context_destin_or_symbol,
*m_mnu_table_context_other;
QMenu* m_mnu_column_visibility; QMenu* m_mnu_column_visibility;
QToolBar* m_control_toolbar; QToolBar* m_control_toolbar;