Skip to content

Commit 6d76f0c

Browse files
adriwebadriweb
committed
gui: fix some missing/bad font stuff.
1 parent 508ea9e commit 6d76f0c

File tree

3 files changed

+5
-23
lines changed

3 files changed

+5
-23
lines changed

‎gui/qt/debugger/hexwidget.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#include <QtWidgets/QScrollBar>
88
#include <QtGui/QPainter>
99
#include <QtGui/QClipboard>
10+
#include <QtGui/QFontDatabase>
1011

1112
HexWidget::HexWidget(QWidget *parent) : QAbstractScrollArea{parent}, m_data{Q_NULLPTR} {
12-
#ifdef Q_OS_WIN
13-
setFont(QFont(QStringLiteral("Courier"), 10));
14-
#else
15-
setFont(QFont(QStringLiteral("Monospace"), 10));
16-
#endif
13+
QFont monospace = QFontDatabase::systemFont(QFontDatabase::FixedFont);
14+
monospace.setStyleHint(QFont::Monospace);
15+
monospace.setPointSize(10);
16+
setFont(monospace);
1717

1818
connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &HexWidget::scroll);
1919
connect(horizontalScrollBar(), &QScrollBar::valueChanged, this, &HexWidget::adjust);

‎gui/qt/mainwindow.ui‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,6 @@
13551355
</property>
13561356
<property name="font">
13571357
<font>
1358-
<family>MS Shell Dlg 2</family>
13591358
<pointsize>9</pointsize>
13601359
</font>
13611360
</property>
@@ -1395,7 +1394,6 @@
13951394
</property>
13961395
<property name="font">
13971396
<font>
1398-
<family>MS Shell Dlg 2</family>
13991397
<pointsize>9</pointsize>
14001398
</font>
14011399
</property>
@@ -1435,7 +1433,6 @@
14351433
</property>
14361434
<property name="font">
14371435
<font>
1438-
<family>MS Shell Dlg 2</family>
14391436
<pointsize>9</pointsize>
14401437
</font>
14411438
</property>
@@ -1475,7 +1472,6 @@
14751472
</property>
14761473
<property name="font">
14771474
<font>
1478-
<family>MS Shell Dlg 2</family>
14791475
<pointsize>9</pointsize>
14801476
</font>
14811477
</property>
@@ -2043,7 +2039,6 @@
20432039
</property>
20442040
<property name="font">
20452041
<font>
2046-
<family>MS Shell Dlg 2</family>
20472042
<pointsize>9</pointsize>
20482043
</font>
20492044
</property>
@@ -2083,7 +2078,6 @@
20832078
</property>
20842079
<property name="font">
20852080
<font>
2086-
<family>MS Shell Dlg 2</family>
20872081
<pointsize>9</pointsize>
20882082
</font>
20892083
</property>
@@ -2123,7 +2117,6 @@
21232117
</property>
21242118
<property name="font">
21252119
<font>
2126-
<family>MS Shell Dlg 2</family>
21272120
<pointsize>9</pointsize>
21282121
</font>
21292122
</property>
@@ -2231,7 +2224,6 @@
22312224
</property>
22322225
<property name="font">
22332226
<font>
2234-
<family>MS Shell Dlg 2</family>
22352227
<pointsize>9</pointsize>
22362228
</font>
22372229
</property>
@@ -2404,7 +2396,6 @@
24042396
</property>
24052397
<property name="font">
24062398
<font>
2407-
<family>MS Shell Dlg 2</family>
24082399
<pointsize>9</pointsize>
24092400
</font>
24102401
</property>
@@ -2444,7 +2435,6 @@
24442435
</property>
24452436
<property name="font">
24462437
<font>
2447-
<family>MS Shell Dlg 2</family>
24482438
<pointsize>9</pointsize>
24492439
</font>
24502440
</property>
@@ -2484,7 +2474,6 @@
24842474
</property>
24852475
<property name="font">
24862476
<font>
2487-
<family>MS Shell Dlg 2</family>
24882477
<pointsize>9</pointsize>
24892478
</font>
24902479
</property>
@@ -2524,7 +2513,6 @@
25242513
</property>
25252514
<property name="font">
25262515
<font>
2527-
<family>MS Shell Dlg 2</family>
25282516
<pointsize>9</pointsize>
25292517
</font>
25302518
</property>
@@ -2564,7 +2552,6 @@
25642552
</property>
25652553
<property name="font">
25662554
<font>
2567-
<family>MS Shell Dlg 2</family>
25682555
<pointsize>9</pointsize>
25692556
</font>
25702557
</property>
@@ -2604,7 +2591,6 @@
26042591
</property>
26052592
<property name="font">
26062593
<font>
2607-
<family>MS Shell Dlg 2</family>
26082594
<pointsize>9</pointsize>
26092595
</font>
26102596
</property>
@@ -2953,7 +2939,6 @@
29532939
</property>
29542940
<property name="font">
29552941
<font>
2956-
<family>MS Shell Dlg 2</family>
29572942
<pointsize>9</pointsize>
29582943
</font>
29592944
</property>
@@ -3066,7 +3051,6 @@
30663051
</property>
30673052
<property name="font">
30683053
<font>
3069-
<family>MS Shell Dlg 2</family>
30703054
<pointsize>9</pointsize>
30713055
</font>
30723056
</property>
@@ -3116,7 +3100,6 @@
31163100
</property>
31173101
<property name="font">
31183102
<font>
3119-
<family>MS Shell Dlg 2</family>
31203103
<pointsize>9</pointsize>
31213104
</font>
31223105
</property>

‎gui/qt/romselection.ui‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
</property>
161161
<property name="font">
162162
<font>
163-
<family>Aharoni</family>
164163
<pointsize>14</pointsize>
165164
<weight>75</weight>
166165
<bold>true</bold>

0 commit comments

Comments
 (0)