Skip to content

Commit 8071c75

Browse files
committed
qt, refactor: Limit scope of QPainter object
1 parent 197450f commit 8071c75

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

src/qt/qrimagewidget.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,25 @@ bool QRImageWidget::setQR(const QString& data, const QString& text)
6666

6767
QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE + (text.isEmpty() ? 0 : 20), QImage::Format_RGB32);
6868
qrAddrImage.fill(0xffffff);
69-
QPainter painter(&qrAddrImage);
70-
painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
69+
{
70+
QPainter painter(&qrAddrImage);
71+
painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
7172

72-
if (!text.isEmpty()) {
73-
QFont font = GUIUtil::fixedPitchFont();
74-
font.setStyleStrategy(QFont::NoAntialias);
75-
QRect paddedRect = qrAddrImage.rect();
73+
if (!text.isEmpty()) {
74+
QFont font = GUIUtil::fixedPitchFont();
75+
font.setStyleStrategy(QFont::NoAntialias);
76+
QRect paddedRect = qrAddrImage.rect();
7677

77-
// calculate ideal font size
78-
qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 20, text, font);
79-
font.setPointSizeF(font_size);
78+
// calculate ideal font size
79+
qreal font_size = GUIUtil::calculateIdealFontSize(paddedRect.width() - 20, text, font);
80+
font.setPointSizeF(font_size);
8081

81-
painter.setFont(font);
82-
paddedRect.setHeight(QR_IMAGE_SIZE+12);
83-
painter.drawText(paddedRect, Qt::AlignBottom|Qt::AlignCenter, text);
82+
painter.setFont(font);
83+
paddedRect.setHeight(QR_IMAGE_SIZE+12);
84+
painter.drawText(paddedRect, Qt::AlignBottom|Qt::AlignCenter, text);
85+
}
8486
}
8587

86-
painter.end();
8788
setPixmap(QPixmap::fromImage(qrAddrImage));
8889

8990
return true;

0 commit comments

Comments
 (0)