diff options
| author | 2015-09-07 10:33:18 +0200 | |
|---|---|---|
| committer | 2015-09-07 21:02:45 +0200 | |
| commit | a962c30df1f56c135be05db10328d81d6eff1cbf (patch) | |
| tree | 93a8d09b8f5940bfc4529fdfd9ffa2d3656faf72 /src | |
| parent | Merge pull request #1117 from yuriks/fix-glad-build (diff) | |
| download | yuzu-a962c30df1f56c135be05db10328d81d6eff1cbf.tar.gz yuzu-a962c30df1f56c135be05db10328d81d6eff1cbf.tar.xz yuzu-a962c30df1f56c135be05db10328d81d6eff1cbf.zip | |
citra-qt: Use monospace font on Disassembler and ARM Registers
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 11 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.cpp | 25 |
2 files changed, 35 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 | |||
| 21 | DisassemblerModel::DisassemblerModel(QObject* parent) : | 22 | DisassemblerModel::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 | } |
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 4174b3945..97384d5e8 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #include "registers.h" | 5 | #include "registers.h" |
| 6 | 6 | ||
| 7 | #include "../util/util.h" | ||
| 8 | |||
| 7 | #include "core/core.h" | 9 | #include "core/core.h" |
| 8 | #include "core/arm/arm_interface.h" | 10 | #include "core/arm/arm_interface.h" |
| 9 | 11 | ||
| @@ -26,9 +28,32 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) { | |||
| 26 | vfp_registers->addChild(child); | 28 | vfp_registers->addChild(child); |
| 27 | } | 29 | } |
| 28 | 30 | ||
| 31 | QFont font = GetMonospaceFont(); | ||
| 32 | |||
| 29 | CreateCPSRChildren(); | 33 | CreateCPSRChildren(); |
| 30 | CreateVFPSystemRegisterChildren(); | 34 | CreateVFPSystemRegisterChildren(); |
| 31 | 35 | ||
| 36 | // Set Registers to display in monospace font | ||
| 37 | for (int i = 0; i < core_registers->childCount(); ++i) | ||
| 38 | core_registers->child(i)->setFont(1, font); | ||
| 39 | |||
| 40 | for (int i = 0; i < vfp_registers->childCount(); ++i) | ||
| 41 | vfp_registers->child(i)->setFont(1, font); | ||
| 42 | |||
| 43 | for (int i = 0; i < vfp_system_registers->childCount(); ++i) { | ||
| 44 | vfp_system_registers->child(i)->setFont(1, font); | ||
| 45 | for (int x = 0; x < vfp_system_registers->child(i)->childCount(); ++x) { | ||
| 46 | vfp_system_registers->child(i)->child(x)->setFont(1, font); | ||
| 47 | } | ||
| 48 | } | ||
| 49 | // Set CSPR to display in monospace font | ||
| 50 | cpsr->setFont(1, font); | ||
| 51 | for (int i = 0; i < cpsr->childCount(); ++i) { | ||
| 52 | cpsr->child(i)->setFont(1, font); | ||
| 53 | for (int x = 0; x < cpsr->child(i)->childCount(); ++x) { | ||
| 54 | cpsr->child(i)->child(x)->setFont(1, font); | ||
| 55 | } | ||
| 56 | } | ||
| 32 | setEnabled(false); | 57 | setEnabled(false); |
| 33 | } | 58 | } |
| 34 | 59 | ||