Changeset 59 for trunk/src/kernel/qpainter_pm.cpp

Timestamp:

Jan 29, 2006, 8:56:21 PM (20 years ago)

Author:

dmik

Message:

Implemented alpha blending for pixmaps.
Improved blitting of masked pixmaps.

File:

• trunk/src/kernel/qpainter_pm.cpp (modified) (3 diffs)

trunk/src/kernel/qpainter_pm.cpp

@@ -505 +505 @@
     if ( (pdev->devFlags & QInternal::CompatibilityMode) != 0 )
         setf(Qt2Compat);
-    else if ( dt == QInternal::Pixmap )         // device is a pixmap
-        ((QPixmap*)pdev)->detach();             // will modify it
+    else if ( dt == QInternal::Pixmap ) {       // device is a pixmap
+        QPixmap *pm = (QPixmap*) pdev;          // will modify it 
+        pm->detach();                           
+        // Ensure the auxiliary masked bitmap created for masking is destroyed
+        // (to cause it to be recreated when the pixmap is blitted next time).
+        // Also ensure the alpha channel of the pixmap is unfolded -- any GPI
+        // call will clear the high byte that may be storing the alpha bits,
+        // so the pixmap will appear as fully transparent.
+        if ( pm->data->mask )
+            pm->prepareForMasking( FALSE, TRUE );
+        if ( pm->data->hasRealAlpha )
+            pm->unfoldAlphaChannel();
+    }
 
     hps = 0;
@@ -802 +813 @@
 }
 
-/*
-  This function adjusts the raster operations for painting into a QBitmap on
-  Windows.
-
-//@@TODO (dmik): think of it. should it be the same on OS/2? see also
-//  qcolor_pm.cpp, qpixmap.cpp (qt_xForm_helper()), qpaintdevice_pm.cpp (bitBlt())
-
-  For bitmaps und Windows, color0 is 0xffffff and color1 is 0x000000 -- so we
-  have to use adjusted ROPs in this case to get the same effect as on Unix.
-*/
-//@@TODO (dmik): possibly remove
-//Qt::RasterOp qt_map_rop_for_bitmaps( Qt::RasterOp r )
-//{
-//    static const Qt::RasterOp ropCodes[] = {
-//      Qt::CopyROP,    // CopyROP
-//      Qt::AndROP,             // OrROP
-//      Qt::NotXorROP,  // XorROP
-//      Qt::NotOrROP,   // NotAndROP
-//      Qt::NotCopyROP, // NotCopyROP
-//      Qt::NotAndROP,  // NotOrROP
-//      Qt::XorROP,     // NotXorROP
-//      Qt::OrROP,      // AndROP
-//      Qt::NotROP,     // NotROP
-//      Qt::SetROP,     // ClearROP
-//      Qt::ClearROP,   // SetROP
-//      Qt::NopROP,     // NopROP
-//      Qt::OrNotROP,   // AndNotROP
-//      Qt::AndNotROP,  // OrNotROP
-//      Qt::NorROP,     // NandROP
-//      Qt::NandROP     // NorROP
-//    };
-//    return ropCodes[r];
-//}
-
 void QPainter::setRasterOp( RasterOp r )
 {
@@ -861 +838 @@
    if ( bg_mode != TransparentMode )
        qt_GpiSetBackMix( hps, qt_ropCodes[r], cpen.style() == NoPen );
-
-//@@TODO (dmik): remove? see above todo (qt_map_rop_for_bitmaps())
-//    if ( pdev->devType()==QInternal::Pixmap && ((QPixmap*)pdev)->isQBitmap() )
-//      SetROP2( hdc, ropCodes[ qt_map_rop_for_bitmaps(r) ] );
-//    else
-//      SetROP2( hdc, ropCodes[r] );
 }