Changeset 478 for trunk/src/gui/image/qpixmap_pm.cpp

Timestamp:

Jan 27, 2010, 8:42:38 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed QPixmap::toPmHPOINTER(): 1) Correct the hot spot when centering a smaller pixmap within the system rectangle; 2) ignore the mini mode since there are no mini pointers.

File:

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

trunk/src/gui/image/qpixmap_pm.cpp

@@ -336 +336 @@
     after use.
 
+    \note \a isMini is ignored when \a isPointer is \c true.
+
     \warning This function is only available on OS/2.
 
@@ -351 +353 @@
     int w = WinQuerySysValue(HWND_DESKTOP, isPointer ? SV_CXPOINTER : SV_CXICON);
     int h = WinQuerySysValue(HWND_DESKTOP, isPointer ? SV_CYPOINTER : SV_CYICON);
-    if (isMini) {
+    if (!isPointer && isMini) {
         w = w / 2;
         h = h / 2;
@@ -373 +375 @@
         pmNew.fill(Qt::transparent);
         QPainter painter(&pmNew);
-        painter.drawPixmap((w - pm.width()) / 2, (h - pm.height()) / 2, pm);
+        int dx = (w - pm.width()) / 2;
+        int dy = (h - pm.height()) / 2;
+        painter.drawPixmap(dx, dy, pm);
         pm = pmNew;
+        hotX += dx;
+        hotY += dy;
     }
 
@@ -380 +386 @@
     info.fPointer = isPointer;
     info.xHotspot = hotX;
-    info.yHotspot = hotY;
+    info.yHotspot = pm.height() - hotY - 1;
     info.hbmColor = pm.toPmHBITMAP(&info.hbmPointer, embedRealAlpha);
     info.hbmMiniPointer = NULLHANDLE;