summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/disassembler.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-09-07 17:52:07 -0400
committerGravatar bunnei2015-09-07 17:52:07 -0400
commit0f2005c370c90e7670cb47c3e8e5f62631534617 (patch)
tree720208cdbc0ee98a9a31aa22421be407a93f7971 /src/citra_qt/debugger/disassembler.cpp
parentMerge pull request #1121 from aroulin/shader-minor-fixes (diff)
parentcitra-qt: Use monospace font on Disassembler and ARM Registers (diff)
downloadyuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.gz
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.xz
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.zip
Merge pull request #1118 from Kloen/monospace-font
citra-qt: Use monospace font on Disassembler and ARM Registers
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index d3629bbf6..f23d823e8 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -9,6 +9,8 @@
9#include "../bootmanager.h" 9#include "../bootmanager.h"
10#include "../hotkeys.h" 10#include "../hotkeys.h"
11 11
12#include "../util/util.h"
13
12#include "core/memory.h" 14#include "core/memory.h"
13 15
14#include "core/core.h" 16#include "core/core.h"
@@ -17,7 +19,6 @@
17#include "core/arm/arm_interface.h" 19#include "core/arm/arm_interface.h"
18#include "core/arm/disassembler/arm_disasm.h" 20#include "core/arm/disassembler/arm_disasm.h"
19 21
20
21DisassemblerModel::DisassemblerModel(QObject* parent) : 22DisassemblerModel::DisassemblerModel(QObject* parent) :
22 QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) { 23 QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
23} 24}
@@ -78,6 +79,14 @@ QVariant DisassemblerModel::data(const QModelIndex& index, int role) const {
78 break; 79 break;
79 } 80 }
80 81
82 case Qt::FontRole:
83 {
84 if (index.column() == 0 || index.column() == 1) { // 2 is the symbols column
85 return GetMonospaceFont();
86 }
87 break;
88 }
89
81 default: 90 default:
82 break; 91 break;
83 } 92 }