amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-23 03:10:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

5.15.1: further work on QTBUG-52697

Browse Source
This commit is contained in:
kleuter 2020-10-13 16:17:51 +02:00
parent 9ab5ea4f93
commit f3747ac853
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
5.15.1/qtbase/src/gui/text/qtextimagehandler.cpp
View File

@ -130,9 +130,11 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format)
const bool hasHeight = format.hasProperty(QTextFormat::ImageHeight); const bool hasHeight = format.hasProperty(QTextFormat::ImageHeight);
const int height = qRound(format.height()); const int height = qRound(format.height());
QPaintDevice *pdev = doc->documentLayout()->paintDevice();
QSize size(width, height); QSize size(width, height);
if (!hasWidth || !hasHeight) { if (!hasWidth || !hasHeight) {
pm = getPixmap(doc, format); pm = getPixmap(doc, format, pdev ? pdev->devicePixelRatioF() : 1.0);
const int pmWidth = pm.width() / pm.devicePixelRatio(); const int pmWidth = pm.width() / pm.devicePixelRatio();
const int pmHeight = pm.height() / pm.devicePixelRatio(); const int pmHeight = pm.height() / pm.devicePixelRatio();
@ -151,7 +153,7 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format)
} }
qreal scale = 1.0; qreal scale = 1.0;
QPaintDevice *pdev = doc->documentLayout()->paintDevice();
if (pdev) { if (pdev) {
if (pm.isNull()) if (pm.isNull())
pm = getPixmap(doc, format); pm = getPixmap(doc, format);