Changeset 763 for trunk/src/gui/image/qicon.cpp

Timestamp:

Jul 29, 2010, 3:37:35 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Reverter r261 as it breaks cross-platform compatibility with applications not providing consistent icon sizes.

File:

• trunk/src/gui/image/qicon.cpp (modified) (3 diffs)

trunk/src/gui/image/qicon.cpp

@@ -139 +139 @@
 
 // returns the smallest of the two that is still larger than or equal to size.
-
-// According to the QIcon documentation, actualSize() and pixmap() may return
-// icons that are smaller than the requested size but never larger. If we only
-// have a larger icon, the engine will smooth scale it to the requested size.
-// Given that, we should prefer the largerst pixmap that is smaller or equal to
-// the requested size (i.e. the most close one from the group of smaller
-// pixmaps), and if there are no such pixmaps, we return the smallest one
-// from the larger group. This function just does that.
-static QPixmapIconEngineEntry *bestSizeMatch(const QSize &size, QPixmapIconEngineEntry *pa, QPixmapIconEngineEntry *pb)
+static QPixmapIconEngineEntry *bestSizeMatch( const QSize &size, QPixmapIconEngineEntry *pa, QPixmapIconEngineEntry *pb)
 {
     int s = area(size);
@@ -160 +152 @@
     }
     int b = area(pb->size);
-
-    // prefer the largest among smaller
-    int res = qMax(a,b);
-    if (res > s) {
-        // fallback to the smallest among larger
+    int res = a;
+    if (qMin(a,b) >= s)
         res = qMin(a,b);
-    }
-
+    else
+        res = qMax(a,b);
     if (res == a)
         return pa;
@@ -311 +300 @@
         return actualSize;
 
-    if (actualSize.width() > size.width() || actualSize.height() > size.height())
+    if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
     return actualSize;