mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-23 07:15:29 +01:00
Code Issues Projects Releases Wiki Activity

qt: Fix visual quality of text in QR image

Browse source
This commit is contained in:
Hennadii Stepanov 2020-08-23 23:53:17 +03:00
parent 8071c75d45
commit 6954156b40
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/qt/qrimagewidget.cpp
View file

@ -9,6 +9,7 @@
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QDrag> #include <QDrag>
#include <QFontDatabase>
#include <QMenu> #include <QMenu>
#include <QMimeData> #include <QMimeData>
#include <QMouseEvent> #include <QMouseEvent>
@ -64,23 +65,24 @@ bool QRImageWidget::setQR(const QString& data, const QString& text)
} }
QRcode_free(code); QRcode_free(code);
QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE + (text.isEmpty() ? 0 : 20), QImage::Format_RGB32); const int qr_image_size = QR_IMAGE_SIZE + (text.isEmpty() ? 0 : 2 * QR_IMAGE_MARGIN);
QImage qrAddrImage(qr_image_size, qr_image_size, QImage::Format_RGB32);
qrAddrImage.fill(0xffffff); qrAddrImage.fill(0xffffff);
{ {
QPainter painter(&qrAddrImage); QPainter painter(&qrAddrImage);
painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE)); painter.drawImage(QR_IMAGE_MARGIN, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
if (!text.isEmpty()) { if (!text.isEmpty()) {
QFont font = GUIUtil::fixedPitchFont();
font.setStyleStrategy(QFont::NoAntialias);
QRect paddedRect = qrAddrImage.rect(); QRect paddedRect = qrAddrImage.rect();
paddedRect.setHeight(QR_IMAGE_SIZE + QR_IMAGE_TEXT_MARGIN);
// calculate ideal font size QFont font = GUIUtil::fixedPitchFont();
qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 20, text, font); font.setStretch(QFont::SemiCondensed);
font.setLetterSpacing(QFont::AbsoluteSpacing, 1);
const qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 2 * QR_IMAGE_TEXT_MARGIN, text, font);
font.setPointSizeF(font_size); font.setPointSizeF(font_size);
painter.setFont(font); painter.setFont(font);
paddedRect.setHeight(QR_IMAGE_SIZE+12);
painter.drawText(paddedRect, Qt::AlignBottom | Qt::AlignCenter, text); painter.drawText(paddedRect, Qt::AlignBottom | Qt::AlignCenter, text);
} }
} }

4
src/qt/qrimagewidget.h
View file

@ -12,7 +12,9 @@
static const int MAX_URI_LENGTH = 255; static const int MAX_URI_LENGTH = 255;
/* Size of exported QR Code image */ /* Size of exported QR Code image */
static const int QR_IMAGE_SIZE = 300; static constexpr int QR_IMAGE_SIZE = 300;
static constexpr int QR_IMAGE_TEXT_MARGIN = 10;
static constexpr int QR_IMAGE_MARGIN = 2 * QR_IMAGE_TEXT_MARGIN;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMenu; class QMenu;