Changeset 6812 in vbox

Timestamp:

Feb 5, 2008 5:23:16 PM (17 years ago)

Author:

vboxsync

Message:

Mac OS X: For painting in the dock on 10.5 the blending mode has to be set explicitly.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxUtils.h (modified) (1 diff)
• src/darwin/VBoxUtils-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils.h

@@ -252 +252 @@
 class VBoxFrameBuffer;
 CGImageRef DarwinQImageToCGImage (const QImage *aImage);
+CGImageRef DarwinQImageFromMimeSourceToCGImage (const char *aSource);
 CGImageRef DarwinQPixmapToCGImage (const QPixmap *aPixmap);
 CGImageRef DarwinQPixmapFromMimeSourceToCGImage (const char *aSource);

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp

@@ -69 +69 @@
 
 /**
+ * Loads an image using Qt and converts it to a CGImage.
+ *
+ * @returns CGImageRef for the new image. (Remember to release it when finished with it.)
+ * @param   aSource     The source name.
+ */
+CGImageRef DarwinQImageFromMimeSourceToCGImage (const char *aSource)
+{
+    QImage qim = QImage::fromMimeSource (aSource);
+    Assert (!qim.isNull());
+    return DarwinQImageToCGImage (&qim);
+}
+
+/**
  * Converts a QPixmap to a CGImage.
  *
@@ -166 +179 @@
     Assert (context);
     /* Clear the background */
+    CGContextSetBlendMode (context, kCGBlendModeNormal);
     CGContextClearRect (context, CGRectMake (0, 0, 128, 128));
     /* rounded corners */
@@ -196 +210 @@
     if (aOverlayImage)
     {
+
         CGRect overlayRect = CGRectMake (targetWidth - CGImageGetWidth (aOverlayImage),
                                          0,