whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFileIconEngine: Use closest area when resolving the actual size 

This is similar to what QPixmapIconEngine does.

Change-Id: I00b9e4083fa03fa0602b8e363055a612791bd149
Task-number: QTBUG-44981
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
bb10
Gabriel de Dietrich 2015-03-13 12:51:09 +01:00
parent d09f81864e
commit 35819dc764
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/widgets/itemviews/qfileiconprovider.cpp
View File

@ -126,15 +126,29 @@ public:
QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE
{
const QList<QSize> &sizes = availableSizes(mode, state);
if (sizes.isEmpty())
const int numberSizes = sizes.length();
if (numberSizes == 0)
return QSize();
foreach (const QSize &availableSize, sizes) {
if (availableSize.width() >= size.width())
return availableSize;
// Find the smallest available size whose area is still larger than the input
// size. Otherwise, use the largest area available size. (We don't assume the
// platform theme sizes are sorted, hence the extra logic.)
const int sizeArea = size.width() * size.height();
QSize actualSize = sizes.first();
int actualArea = actualSize.width() * actualSize.height();
for (int i = 1; i < numberSizes; ++i) {
const QSize &s = sizes.at(i);
const int a = s.width() * s.height();
if ((sizeArea <= a && a < actualArea) || (actualArea < sizeArea && actualArea < a)) {
actualSize = s;
actualArea = a;
}
}
return sizes.last();
if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
actualSize.scale(size, Qt::KeepAspectRatio);
return actualSize;
}
private: