From 9de3b15d07dcf1be5ff7b26e2e7987ed8e91a0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <daniel.vratil@kdab.com>
Date: Mon, 7 Nov 2016 09:40:34 +0100
Subject: [PATCH] QLabel: take DPR of QMovie in account when calculating
 sizeHint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QLabel already does that for QPixmap, so just do the same for
QMovie's current pixmap.

Task-number: QTBUG-48157
Change-Id: I7b26460f778e56ff017a5efd433f8929f30e4b41
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/widgets/widgets/qlabel.cpp                |   1 +
 tests/auto/widgets/widgets/qlabel/red@2x.png  | Bin 0 -> 105 bytes
 .../widgets/widgets/qlabel/tst_qlabel.cpp     |  24 ++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 tests/auto/widgets/widgets/qlabel/red@2x.png

diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index a07a964595..34b75cb550 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -579,6 +579,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const
 #ifndef QT_NO_MOVIE
     } else if (movie && !movie->currentPixmap().isNull()) {
         br = movie->currentPixmap().rect();
+        br.setSize(br.size() / movie->currentPixmap().devicePixelRatio());
 #endif
     } else if (isTextLabel) {
         int align = QStyle::visualAlignment(textDirection(), QFlag(this->align));
diff --git a/tests/auto/widgets/widgets/qlabel/red@2x.png b/tests/auto/widgets/widgets/qlabel/red@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a843e744f405610bc0e621472eaca0ecc4ecf45
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j3?$ucQqzDGbAV5X>wg9Y$w!>#K(3;vi(^Pe
s<J*IcKn}y<1wVu1A2Nh8f;eE%&!}F)z}Ve&ekO?P>FVdQ&MBb@08_IUtN;K2

literal 0
HcmV?d00001

diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index d76dbf6b46..2b2756fef3 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -101,6 +101,9 @@ private Q_SLOTS:
     void taskQTBUG_7902_contextMenuCrash();
 #endif
 
+    void taskQTBUG_48157_dprPixmap();
+    void taskQTBUG_48157_dprMovie();
+
 private:
     QLabel *testWidget;
     QPointer<Widget> test_box;
@@ -546,5 +549,26 @@ void tst_QLabel::taskQTBUG_7902_contextMenuCrash()
 }
 #endif
 
+void tst_QLabel::taskQTBUG_48157_dprPixmap()
+{
+    QLabel label;
+    QPixmap pixmap;
+    pixmap.load(QFINDTESTDATA(QStringLiteral("red@2x.png")));
+    QCOMPARE(pixmap.devicePixelRatio(), 2.0);
+    label.setPixmap(pixmap);
+    QCOMPARE(label.sizeHint(), pixmap.rect().size() / pixmap.devicePixelRatio());
+}
+
+void tst_QLabel::taskQTBUG_48157_dprMovie()
+{
+    QLabel label;
+    QMovie movie;
+    movie.setFileName(QFINDTESTDATA(QStringLiteral("red@2x.png")));
+    movie.start();
+    QCOMPARE(movie.currentPixmap().devicePixelRatio(), 2.0);
+    label.setMovie(&movie);
+    QCOMPARE(label.sizeHint(), movie.currentPixmap().size() / movie.currentPixmap().devicePixelRatio());
+}
+
 QTEST_MAIN(tst_QLabel)
 #include "tst_qlabel.moc"