Changeset 941

Timestamp:

Aug 5, 2011, 2:26:40 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fixed creating HPOINTERs from QPixmaps with no mask.

HPOINTERs are used to assign the icon to the top-level window and
to create custom PM mouse pointer shapes. Prior to to this fix it was
impossible to e.g. set a PNG with no transparency as the window icon.

Author: Rudi Ihle.

File:

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

trunk/src/gui/image/qpixmap_pm.cpp

@@ -108 +108 @@
     routines to do real alpha blending.
 
-    Note that if the pixmap does neither have a mask nor the alpha channel but
-    \a mask is not NULL, a NULLHANDLE value will be stored there.
+    Note that if \a mask is not NULL but the pixmap does neither have a mask nor
+    the alpha channel, an emptpy bitmap mask with no transparency (zeroed AND
+    and XOR parts) will be created and returned.
 
     It is the caller's responsibility to free both returned \c HBITMAP handes
@@ -160 +161 @@
                           (PBITMAPINFO2)&bmi);
 
-    if (mask && hasAlpha()) {
+    if (mask) {
         // get the mask
         QImage mask;
-        if (!embedRealAlpha) {
-            // We prefer QImage::createAlphaMask() over QPixmap::mask()
-            // since the former will dither while the latter will convert any
-            // non-zero alpha value to an opaque pixel
-            mask = image.createAlphaMask().convertToFormat(QImage::Format_Mono);
-
-            // note: for some strange reason, createAlphaMask() (as opposed to
-            // mask().toImage()) returns an image already flipped top to bottom,
-            // so take it into account
-
-            // create the AND mask
-            mask.invertPixels();
-            // add the XOR mask (and leave it zeroed)
-            mask = mask.copy(0, -h, w, h * 2);
+        if (hasAlpha()) {
+            if (!embedRealAlpha) {
+                // We prefer QImage::createAlphaMask() over QPixmap::mask()
+                // since the former will dither while the latter will convert any
+                // non-zero alpha value to an opaque pixel
+                mask = image.createAlphaMask().convertToFormat(QImage::Format_Mono);
+
+                // note: for some strange reason, createAlphaMask() (as opposed to
+                // mask().toImage()) returns an image already flipped top to bottom,
+                // so take it into account
+
+                // create the AND mask
+                mask.invertPixels();
+                // add the XOR mask (and leave it zeroed)
+                mask = mask.copy(0, -h, w, h * 2);
+            } else {
+                // if we embedded real alpha, we still need a mask if we are going
+                // to create a pointer out of this pixmap (WinCreatePointerIndirect()
+                // requirement), but we will use QPixmap::mask() because it won't be
+                // able to destroy the alpha channel of non-fully transparent pixels
+                // when preparing the color bitmap for masking later. We could also
+                // skip this prepare step, but well, let's go this way, it won't hurt.
+                mask = this->mask().toImage().convertToFormat(QImage::Format_Mono);
+
+                // create the AND mask
+                mask.invertPixels();
+                // add the XOR mask (and leave it zeroed)
+                mask = mask.copy(0, 0, w, h * 2);
+                // flip the bitmap top to bottom for PM
+                mask = mask.mirrored(false, true);
+            }
         } else {
-            // if we embedded real alpha, we still need a mask if we are going
-            // to create a pointer out of this pixmap (WinCreatePointerIndirect()
-            // requirement), but we will use QPixmap::mask() because it won't be
-            // able to destroy the alpha channel of non-fully transparent pixels
-            // when preparing the color bitmap for masking later. We could also
-            // skip this prepare step, but well, let's go this way, it won't hurt.
-            mask = this->mask().toImage().convertToFormat(QImage::Format_Mono);
-
-            // create the AND mask
-            mask.invertPixels();
-            // add the XOR mask (and leave it zeroed)
-            mask = mask.copy(0, 0, w, h * 2);
-            // flip the bitmap top to bottom for PM
-            mask = mask.mirrored(false, true);
+            mask = QImage(w, h * 2, QImage::Format_Mono);
+            mask.fill(0);
         }