summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/disassembler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index cc4cb13fa..ccc83abf2 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -23,7 +23,7 @@ DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread& emu_thread) :
23 model = new QStandardItemModel(this); 23 model = new QStandardItemModel(this);
24 model->setColumnCount(3); 24 model->setColumnCount(3);
25 disasm_ui.treeView->setModel(model); 25 disasm_ui.treeView->setModel(model);
26 disasm_ui.tableView->setModel(model); 26
27 RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut); 27 RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut);
28 RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), Qt::ApplicationShortcut); 28 RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), Qt::ApplicationShortcut);
29 RegisterHotkey("Disassembler", "Step into", QKeySequence(Qt::Key_F11), Qt::ApplicationShortcut); 29 RegisterHotkey("Disassembler", "Step into", QKeySequence(Qt::Key_F11), Qt::ApplicationShortcut);
@@ -65,16 +65,10 @@ void DisassemblerWidget::Init()
65 disasm_ui.treeView->resizeColumnToContents(0); 65 disasm_ui.treeView->resizeColumnToContents(0);
66 disasm_ui.treeView->resizeColumnToContents(1); 66 disasm_ui.treeView->resizeColumnToContents(1);
67 disasm_ui.treeView->resizeColumnToContents(2); 67 disasm_ui.treeView->resizeColumnToContents(2);
68 disasm_ui.tableView->resizeColumnToContents(0);
69 disasm_ui.tableView->resizeColumnToContents(1);
70 disasm_ui.tableView->resizeColumnToContents(2);
71 68
72 QModelIndex model_index = model->index(0, 0); 69 QModelIndex model_index = model->index(0, 0);
73 disasm_ui.treeView->scrollTo(model_index); 70 disasm_ui.treeView->scrollTo(model_index);
74 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); 71 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
75
76 disasm_ui.tableView->scrollTo(model_index);
77 disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
78} 72}
79 73
80void DisassemblerWidget::OnSetBreakpoint() 74void DisassemblerWidget::OnSetBreakpoint()
@@ -138,10 +132,6 @@ void DisassemblerWidget::OnCPUStepped()
138 QModelIndex model_index = model->index(index, 0); 132 QModelIndex model_index = model->index(index, 0);
139 disasm_ui.treeView->scrollTo(model_index); 133 disasm_ui.treeView->scrollTo(model_index);
140 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); 134 disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
141
142 disasm_ui.tableView->scrollTo(model_index);
143 disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
144 disasm_ui.tableView->selectionModel()->select(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
145} 135}
146 136
147int DisassemblerWidget::SelectedRow() 137int DisassemblerWidget::SelectedRow()
@@ -151,11 +141,4 @@ int DisassemblerWidget::SelectedRow()
151 return -1; 141 return -1;
152 142
153 return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row(); 143 return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row();
154} 144} \ No newline at end of file
155/*
156void DisassemblerWidget::paintEvent()
157{
158 QPainter painter(this);
159 painter.drawRect(10, 10, 50, 50);
160}
161*/ \ No newline at end of file