Skip to content

Commit f4016dd

Browse files
committed
qt: Fix visual quality of text in QR image
1 parent 8071c75 commit f4016dd

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/qt/qrimagewidget.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <QApplication>
1010
#include <QClipboard>
1111
#include <QDrag>
12+
#include <QFontDatabase>
1213
#include <QMenu>
1314
#include <QMimeData>
1415
#include <QMouseEvent>
@@ -64,24 +65,25 @@ bool QRImageWidget::setQR(const QString& data, const QString& text)
6465
}
6566
QRcode_free(code);
6667

67-
QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE + (text.isEmpty() ? 0 : 20), QImage::Format_RGB32);
68+
const int qr_image_size = QR_IMAGE_SIZE + (text.isEmpty() ? 0 : 2 * QR_IMAGE_MARGIN);
69+
QImage qrAddrImage(qr_image_size, qr_image_size, QImage::Format_RGB32);
6870
qrAddrImage.fill(0xffffff);
6971
{
7072
QPainter painter(&qrAddrImage);
71-
painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
73+
painter.drawImage(QR_IMAGE_MARGIN, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
7274

7375
if (!text.isEmpty()) {
74-
QFont font = GUIUtil::fixedPitchFont();
75-
font.setStyleStrategy(QFont::NoAntialias);
7676
QRect paddedRect = qrAddrImage.rect();
77+
paddedRect.setHeight(QR_IMAGE_SIZE + QR_IMAGE_TEXT_MARGIN);
7778

78-
// calculate ideal font size
79-
qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 20, text, font);
79+
QFont font = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
80+
font.setStretch(QFont::SemiCondensed);
81+
font.setLetterSpacing(QFont::AbsoluteSpacing, 1);
82+
const qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 2 * QR_IMAGE_TEXT_MARGIN, text, font);
8083
font.setPointSizeF(font_size);
8184

8285
painter.setFont(font);
83-
paddedRect.setHeight(QR_IMAGE_SIZE+12);
84-
painter.drawText(paddedRect, Qt::AlignBottom|Qt::AlignCenter, text);
86+
painter.drawText(paddedRect, Qt::AlignBottom | Qt::AlignCenter, text);
8587
}
8688
}
8789

src/qt/qrimagewidget.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
static const int MAX_URI_LENGTH = 255;
1313

1414
/* Size of exported QR Code image */
15-
static const int QR_IMAGE_SIZE = 300;
15+
static constexpr int QR_IMAGE_SIZE = 300;
16+
static constexpr int QR_IMAGE_TEXT_MARGIN = 10;
17+
static constexpr int QR_IMAGE_MARGIN = 2 * QR_IMAGE_TEXT_MARGIN;
1618

1719
QT_BEGIN_NAMESPACE
1820
class QMenu;

0 commit comments

Comments
 (0)