Changeset 6482 in vbox

Timestamp:

Jan 24, 2008 2:29:40 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27483

Message:

Mac OS X: Now the dock screen icon is painted in realtime. It uses the current aspect ratio of the vm screen and shows the running states overlay.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (4 diffs)

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

@@ -77 +77 @@
 
     void setMask (const QRegion &aRegion);
+
+#ifdef Q_WS_MAC
+    CGImageRef dockImageState () const;
+#endif
 
 public slots:

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

@@ -255 +255 @@
 CGImageRef DarwinQPixmapFromMimeSourceToCGImage (const char *aSource);
 CGImageRef DarwinCreateDockBadge (const char *aSource);
-CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer);
+CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage);
 OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
 #endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -2808 +2808 @@
             /* Update the dock icon if we are in the running state */
             if (isRunning())
-                SetApplicationDockTileImage(::DarwinCreateDockPreview(mFrameBuf));
+                SetApplicationDockTileImage (::DarwinCreateDockPreview(mFrameBuf, mMainWnd->dockImageState ()));
 #endif
             return;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1898 +1898 @@
     }
 #ifdef Q_WS_MAC
-    if (1)//(element & DockTile)
-    {
-        //CGContextDrawImage
-        //HIViewDrawCGImage();
-        //CGImageAlphaInfo
-        CGImageRef img;
-        if (machine_state == CEnums::Running)
-            img = dockImgStateRunning;
-        else if (machine_state == CEnums::Paused)
-            img = dockImgStatePaused;
-        else if (machine_state == CEnums::Restoring)
-            img = dockImgStateRestoring;
-        else if (machine_state == CEnums::Saving)
-            img = dockImgStateSaving;
-        else
-            img = NULL;
         SetApplicationDockTileImage (dockImgOS);
+        CGImageRef img = dockImageState ();
         if (img)
             OverlayApplicationDockTileImage (img);
-    }
 #endif
 }
@@ -2183 +2167 @@
     return true;
 }
+
+#ifdef Q_WS_MAC
+CGImageRef VBoxConsoleWnd::dockImageState () const
+{
+    CGImageRef img;
+    if (machine_state == CEnums::Running)
+        img = dockImgStateRunning;
+    else if (machine_state == CEnums::Paused)
+        img = dockImgStatePaused;
+    else if (machine_state == CEnums::Restoring)
+        img = dockImgStateRestoring;
+    else if (machine_state == CEnums::Saving)
+        img = dockImgStateSaving;
+    else
+        img = NULL;
+    return img;
+}
+#endif 
 
 //

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

@@ -136 +136 @@
  * @param   aFrameBuffer    The guest frame buffer.
  */
-CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer)
+CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage)
 {
     CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
@@ -143 +143 @@
     CGDataProviderRef dp = CGDataProviderCreateWithData (aFrameBuffer, aFrameBuffer->address(), aFrameBuffer->bitsPerPixel() / 8 * aFrameBuffer->width() * aFrameBuffer->height() , NULL);
     CGImageRef ir = CGImageCreate (aFrameBuffer->width(), aFrameBuffer->height(), 8, 32, aFrameBuffer->bytesPerLine(), cs,
-                                   kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0 /* decode */, 0 /* shouldInterpolate */,
+                                   kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0, false,
                                    kCGRenderingIntentDefault);
 
@@ -153 +153 @@
     int targetWidth = 128;
     int targetHeight = 128;
+    int scaledWidth;
+    int scaledHeight;
     float aspect = static_cast<float>(aFrameBuffer->width()) / aFrameBuffer->height();
-    CGRect rect;
     if (aspect > 1.0)
     {
-        rect.origin.x = 0;
-        rect.origin.y = (targetHeight - targetHeight / aspect) / 2;
-        rect.size.width = targetWidth;
-        rect.size.height = targetHeight / aspect;
+        scaledWidth = targetWidth;
+        scaledHeight = targetHeight / aspect;
     }
     else
     {
-        rect.origin.x = (targetWidth - targetWidth * aspect) / 2;
-        rect.origin.y = 0;
-        rect.size.width = targetWidth*aspect;
-        rect.size.height = targetHeight;
+        scaledWidth = targetWidth * aspect;
+        scaledHeight = targetHeight;
     }
-
+    CGRect iconRect = CGRectMake ((targetWidth - scaledWidth) / 2.0, 
+                                  (targetHeight - scaledHeight) / 2.0, 
+                                  scaledWidth, scaledHeight);
     /* Create a bitmap context to draw on */
     CGImageRef dockImage = NULL;
@@ -178 +177 @@
     {
         CGContextRef context = CGBitmapContextCreate (bitmapData, targetWidth, targetHeight, 8, bitmapBytesPerRow, cs, kCGImageAlphaPremultipliedLast);
-
-        /* Draw on the bitmap */
-        CGContextDrawImage (context, rect, ir);
-
+        /* rounded corners */
+//        CGContextSetLineJoin (context, kCGLineJoinRound);
+//        CGContextSetShadow (context, CGSizeMake(10, 5), 1);
+//        CGContextSetAllowsAntialiasing (context, true);
+        /* some little boarder */
+        iconRect = CGRectInset (iconRect, 1, 1);
+        /* gray stroke */
+        CGContextSetRGBStrokeColor (context, 225.0/255.0, 218.0/255.0, 211.0/255.0, 1);
+        iconRect = CGRectInset (iconRect, 6, 6);
+        CGContextStrokeRectWithWidth (context, iconRect, 12);
+        iconRect = CGRectInset (iconRect, 5, 5);
+        /* black stroke */
+        CGContextSetRGBStrokeColor (context, 0.0, 0.0, 0.0, 1.0);
+        CGContextStrokeRectWithWidth (context, iconRect, 2);
+        /* vm content */
+        iconRect = CGRectInset (iconRect, 1, 1);
+        CGContextDrawImage (context, iconRect, ir);
+        /* the overlay image */
+        if (aOverlayImage)
+        {
+            CGRect overlayRect = CGRectMake (targetWidth - CGImageGetWidth (aOverlayImage), 0, CGImageGetWidth (aOverlayImage), CGImageGetHeight (aOverlayImage));
+            CGContextDrawImage (context, overlayRect, aOverlayImage);
+        }
         /* Create the preview image ref from the bitmap */
         dockImage = CGBitmapContextCreateImage (context);