Changeset 264

Timestamp:

Oct 28, 2009, 10:10:28 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPixmap: Don't scale small pixmaps to fit the system icon size when creating icons (e.g. 16x16 -> 20x20) but instead center them in a system sized rectangle to avoid ugly distortions happening when scaling such small images.

File:

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

trunk/src/gui/image/qpixmap_pm.cpp

@@ -47 +47 @@
 #include "qicon.h"
 #include "qbitmap.h"
+#include "qpainter.h"
 
 #include "qt_os2.h"
@@ -230 +231 @@
         return NULLHANDLE;
 
+    // get the system icon size
     int w = WinQuerySysValue(HWND_DESKTOP, isPointer ? SV_CXPOINTER : SV_CXICON);
     int h = WinQuerySysValue(HWND_DESKTOP, isPointer ? SV_CYPOINTER : SV_CYICON);
+    int w2 = w / 2;
+    int h2 = h / 2;
+
+    // obtain the closest (but never larger) icon sizes we have
     QSize size = icon.actualSize(QSize(w, h));
-    QSize sizeMini = icon.actualSize(QSize(w / 2, h / 2));
+    QSize sizeMini = icon.actualSize(QSize(w2, h2));
 
     QPixmap pm = icon.pixmap(size);
@@ -239 +245 @@
     if (pm.isNull() && pmMini.isNull())
         return NULLHANDLE;
+
+    // if we got smaller pixmaps then center them inside the system sized rect
+    // instead of letting WinCreatePointerIndirect() scale them (this covers a
+    // usual case when we got 32 and 16 px pixmaps on a 120 DPI system where the
+    // icon size is 40 and 20 px respectively): scaling such small images looks
+    // really ugly.
+    if (!pm.isNull() && (pm.width() < w || pm.height() < h)) {
+        Q_ASSERT(pm.width() <= w && pm.height() <= h);
+        QPixmap pmNew(w, h);
+        pmNew.fill(Qt::transparent);
+        QPainter painter(&pmNew);
+        painter.drawPixmap((w - pm.width()) / 2, (h - pm.height()) / 2, pm);
+        pm = pmNew;
+    }
+    if (!pmMini.isNull() && (pmMini.width() < w2 || pmMini.height() < h2)) {
+        Q_ASSERT(pmMini.width() <= w2 && pmMini.height() <= h2);
+        QPixmap pmNew(w2, h2);
+        pmNew.fill(Qt::transparent);
+        QPainter painter(&pmNew);
+        painter.drawPixmap((w2 - pmMini.width()) / 2, (h2 - pmMini.height()) / 2, pmMini);
+        pmMini = pmNew;
+    }
 
     if (pm.isNull()) {