summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-09-07 23:52:07 +0200
committerbunnei <bunneidev@gmail.com>2015-09-07 23:52:07 +0200
commit0f2005c370c90e7670cb47c3e8e5f62631534617 (patch)
tree720208cdbc0ee98a9a31aa22421be407a93f7971 /src
parentMerge pull request #1121 from aroulin/shader-minor-fixes (diff)
parentcitra-qt: Use monospace font on Disassembler and ARM Registers (diff)
downloadyuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.gz
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.bz2
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.lz
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.xz
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.tar.zst
yuzu-0f2005c370c90e7670cb47c3e8e5f62631534617.zip
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp11
-rw-r--r--src/citra_qt/debugger/registers.cpp25
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 @@
#include "../bootmanager.h"
#include "../hotkeys.h"
+#include "../util/util.h"
+
#include "core/memory.h"
#include "core/core.h"
@@ -17,7 +19,6 @@
#include "core/arm/arm_interface.h"
#include "core/arm/disassembler/arm_disasm.h"
-
DisassemblerModel::DisassemblerModel(QObject* parent) :
QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
}
@@ -78,6 +79,14 @@ QVariant DisassemblerModel::data(const QModelIndex& index, int role) const {
break;
}
+ case Qt::FontRole:
+ {
+ if (index.column() == 0 || index.column() == 1) { // 2 is the symbols column
+ return GetMonospaceFont();
+ }
+ break;
+ }
+
default:
break;
}
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 @@
#include "registers.h"
+#include "../util/util.h"
+
#include "core/core.h"
#include "core/arm/arm_interface.h"
@@ -26,9 +28,32 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) {
vfp_registers->addChild(child);
}
+ QFont font = GetMonospaceFont();
+
CreateCPSRChildren();
CreateVFPSystemRegisterChildren();
+ // Set Registers to display in monospace font
+ for (int i = 0; i < core_registers->childCount(); ++i)
+ core_registers->child(i)->setFont(1, font);
+
+ for (int i = 0; i < vfp_registers->childCount(); ++i)
+ vfp_registers->child(i)->setFont(1, font);
+
+ for (int i = 0; i < vfp_system_registers->childCount(); ++i) {
+ vfp_system_registers->child(i)->setFont(1, font);
+ for (int x = 0; x < vfp_system_registers->child(i)->childCount(); ++x) {
+ vfp_system_registers->child(i)->child(x)->setFont(1, font);
+ }
+ }
+ // Set CSPR to display in monospace font
+ cpsr->setFont(1, font);
+ for (int i = 0; i < cpsr->childCount(); ++i) {
+ cpsr->child(i)->setFont(1, font);
+ for (int x = 0; x < cpsr->child(i)->childCount(); ++x) {
+ cpsr->child(i)->child(x)->setFont(1, font);
+ }
+ }
setEnabled(false);
}