From b147c28e275596e36243905f4d9e4f140bfedb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 16 Feb 2021 14:39:06 +0100 Subject: [PATCH] Add scaledPixmap() override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QAbstractFileIconEngine implements the QIconEngine interface and creates a new interface where subclasses override the filePixmap() function. QIconEngine subclasses must now also override scaledPixmap(); add implementation which forwards to filePixmap(). (The intermediate implementation in QPixmapIconEngine is not used by QAbstractFileIconEngine.) Task-number: QTBUG-91104 Change-Id: I229e3a003ad0c3fff768eac7e75c59fe7145fcaa Reviewed-by: Tor Arne Vestbø (cherry picked from commit bb110cee5dbcce58c44e9a59b47fd0bbf6aaddaa) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qabstractfileiconengine.cpp | 6 ++++++ src/gui/image/qabstractfileiconengine_p.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/gui/image/qabstractfileiconengine.cpp b/src/gui/image/qabstractfileiconengine.cpp index c5800d91195..8fa29e82271 100644 --- a/src/gui/image/qabstractfileiconengine.cpp +++ b/src/gui/image/qabstractfileiconengine.cpp @@ -85,6 +85,12 @@ QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode, return result; } +QPixmap QAbstractFileIconEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) +{ + Q_UNUSED(scale); // (size is pre-multiplied by scale) + return pixmap(size, mode, state); +} + QSize QAbstractFileIconEngine::actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) { diff --git a/src/gui/image/qabstractfileiconengine_p.h b/src/gui/image/qabstractfileiconengine_p.h index 865da58f151..eccc83a4fe6 100644 --- a/src/gui/image/qabstractfileiconengine_p.h +++ b/src/gui/image/qabstractfileiconengine_p.h @@ -64,6 +64,7 @@ public: : QPixmapIconEngine(), m_fileInfo(info), m_options(opts) {} QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State) override; + QPixmap scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State, qreal scale) override; QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override; QFileInfo fileInfo() const { return m_fileInfo; }