Fix desktop image provider size fallback
This commit is contained in:
@@ -33,8 +33,10 @@ Resources::Icon Resources::parseIcon(const QString &id)
|
|||||||
|
|
||||||
QPixmap Resources::pixmap(const QSize &requestedSize, const QIcon &icon, QIcon::Mode mode, QSize *outSize)
|
QPixmap Resources::pixmap(const QSize &requestedSize, const QIcon &icon, QIcon::Mode mode, QSize *outSize)
|
||||||
{
|
{
|
||||||
Q_ASSERT(requestedSize.isValid());
|
QSize actualSize = requestedSize.isValid() && !requestedSize.isEmpty() ? requestedSize : icon.actualSize(minIconSize);
|
||||||
QSize actualSize = requestedSize.isValid() ? requestedSize : icon.availableSizes().constFirst();
|
if (!actualSize.isValid() || actualSize.isEmpty()) {
|
||||||
|
actualSize = minIconSize;
|
||||||
|
}
|
||||||
if (outSize) {
|
if (outSize) {
|
||||||
*outSize = actualSize;
|
*outSize = actualSize;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user