summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qabstractfileiconengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image/qabstractfileiconengine.cpp')
-rw-r--r--src/gui/image/qabstractfileiconengine.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/image/qabstractfileiconengine.cpp b/src/gui/image/qabstractfileiconengine.cpp
index e94451e4bb..b9b9abc1f5 100644
--- a/src/gui/image/qabstractfileiconengine.cpp
+++ b/src/gui/image/qabstractfileiconengine.cpp
@@ -29,6 +29,11 @@ using namespace Qt::StringLiterals;
QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
QIcon::State state)
{
+ return scaledPixmap(size, mode, state, 1.0);
+}
+
+QPixmap QAbstractFileIconEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale)
+{
Q_UNUSED(mode);
Q_UNUSED(state);
@@ -37,13 +42,13 @@ QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
QString key = cacheKey();
if (key.isEmpty())
- return filePixmap(size, mode, state);
+ return filePixmap(size * scale, mode, state);
key += u'_' + QString::number(size.width());
QPixmap result;
if (!QPixmapCache::find(key, &result)) {
- result = filePixmap(size, mode, state);
+ result = filePixmap(size * scale, mode, state);
if (!result.isNull())
QPixmapCache::insert(key, result);
}
@@ -51,17 +56,11 @@ 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)
{
const QList<QSize> &sizes = availableSizes(mode, state);
- const int numberSizes = sizes.length();
+ const int numberSizes = sizes.size();
if (numberSizes == 0)
return QSize();