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

Timestamp:

Oct 28, 2009, 8:20:57 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QIcon: Be in line with the documentation and prefer the largest pixmap among smaller ones (instead of the smallest among larger) when searching for the best match for the given icon size in the pixmap icon engine [vendor bug].

File:

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

trunk/src/gui/image/qicon.cpp

@@ -188 +188 @@
 
 // returns the smallest of the two that is still larger than or equal to size.
-static QPixmapIconEngineEntry *bestSizeMatch( const QSize &size, QPixmapIconEngineEntry *pa, QPixmapIconEngineEntry *pb)
+
+// 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)
 {
     int s = area(size);
@@ -201 +209 @@
     }
     int b = area(pb->size);
-    int res = a;
-    if (qMin(a,b) >= s)
+
+    // prefer the largest among smaller
+    int res = qMax(a,b);
+    if (res > s) {
+        // fallback to the smallest among larger
         res = qMin(a,b);
-    else
-        res = qMax(a,b);
+    
+
     if (res == a)
         return pa;
@@ -347 +358 @@
         return actualSize;
 
-    if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
+    if ())
         actualSize.scale(size, Qt::KeepAspectRatio);
     return actualSize;