Changeset 15493 in vbox

Timestamp:

Dec 15, 2008 11:00:58 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: dock icon handling updates

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -211 +211 @@
 /* Special routines for the dock handling */
 CGImageRef darwinCreateDockBadge (const char *aSource);
-void darwinUpdateDockPreview (CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage = NULL);
-void darwinUpdateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage);
+void darwinUpdateDockPreview (QWidget *aMainWindow, CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage = NULL);
+void darwinUpdateDockPreview (QWidget *aMainWindow, VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage);
 
 /* Icons in the menu of an mac application are unusual. */

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

@@ -3085 +3085 @@
 #ifdef VBOX_GUI_USE_QUARTZ2D
     if (mode == VBoxDefs::Quartz2DMode && mFrameBuf)
+    {
         mFrameBuf->paintEvent (pe);
+        ::darwinUpdateDockPreview (mMainWnd,
+                                   ::darwinToCGImageRef (&mPausedShot),
+                                   mVirtualBoxLogo,
+                                   mMainWnd->dockImageState());
+    }
     else
 #endif
@@ -3101 +3107 @@
         viewport()->setAttribute (Qt::WA_PaintOnScreen, paintOnScreen);
 #ifdef Q_WS_MAC
-        ::darwinUpdateDockPreview (::darwinToCGImageRef (&mPausedShot),
+        ::darwinUpdateDockPreview (mMainWnd,
+                                   ::darwinToCGImageRef (&mPausedShot),
                                    mVirtualBoxLogo,
                                    mMainWnd->dockImageState());
@@ -3885 +3892 @@
             CGImageRef ir =
                 static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
-            ::darwinUpdateDockPreview (ir, mVirtualBoxLogo);
+            ::darwinUpdateDockPreview (mMainWnd, ir, mVirtualBoxLogo);
         }
         else
 # endif
-            ::darwinUpdateDockPreview (mFrameBuf, mVirtualBoxLogo);
-    }
-}
-#endif
-
+            ::darwinUpdateDockPreview (mMainWnd, mFrameBuf, mVirtualBoxLogo);
+    }
+}
+#endif
+

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

@@ -187 +187 @@
  * @param   aStateImage   an optional state overlay image to add at the center of the icon
  */
-void darwinUpdateDockPreview (CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage /*= NULL*/)
+void darwinUpdateDockPreview (QWidget *aMainWindow, CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage /*= NULL*/)
 {
     Assert (aVMImage);
@@ -237 +237 @@
     CGContextDrawImage (context, iconRect, aVMImage);
     /* Process the content of any external OpenGL windows. */
-    WindowRef w = FrontNonFloatingWindow();
+    WindowRef w = darwinToWindowRef (aMainWindow);
     WindowGroupRef g = GetWindowGroup (w);
     WindowGroupContentOptions wgco = kWindowGroupContentsReturnWindows | kWindowGroupContentsRecurse | kWindowGroupContentsVisible;
@@ -254 +254 @@
             wc != w)
         {
-            Rect tmpR1;
-            GetWindowBounds (wc, kWindowContentRgn, &tmpR1);
-            HIRect rect;
-            rect.size.width = (tmpR1.right-tmpR1.left) * a1;
-            rect.size.height = (tmpR1.bottom-tmpR1.top) * a2;
-            rect.origin.x = iconRect.origin.x + (tmpR1.left - mainRect.origin.x) * a1;
-            rect.origin.y = targetHeight - (iconRect.origin.y + (tmpR1.top - mainRect.origin.y) * a2) - rect.size.height;
-            /* This is a big, bad hack. The following functions aren't
-             * documented nor official supported by apple. But its the only way
-             * to capture the OpenGL content of a window without fiddling
-             * around with gPixelRead or something like that. */
-            CGSWindowID wid = GetNativeWindowFromWindowRef(wc);
-            CGContextCopyWindowCaptureContentsToRect(context, rect, CGSMainConnectionID(), wid, 0);
+            WindowClass winClass;
+            status = GetWindowClass (wc, &winClass);
+            if (status == noErr &&
+                winClass == kOverlayWindowClass)
+            {
+                Rect tmpR1;
+                GetWindowBounds (wc, kWindowContentRgn, &tmpR1);
+                HIRect rect;
+                rect.size.width = (tmpR1.right-tmpR1.left) * a1;
+                rect.size.height = (tmpR1.bottom-tmpR1.top) * a2;
+                rect.origin.x = iconRect.origin.x + (tmpR1.left - mainRect.origin.x) * a1;
+                rect.origin.y = targetHeight - (iconRect.origin.y + (tmpR1.top - mainRect.origin.y) * a2) - rect.size.height;
+                /* This is a big, bad hack. The following functions aren't
+                 * documented nor official supported by apple. But its the only way
+                 * to capture the OpenGL content of a window without fiddling
+                 * around with gPixelRead or something like that. */
+                CGSWindowID wid = GetNativeWindowFromWindowRef(wc);
+                CGContextCopyWindowCaptureContentsToRect(context, rect, CGSMainConnectionID(), wid, 0);
+            }
         }
     }
@@ -304 +310 @@
  * @param   aOverlayImage   an optional icon overlay image to add at the bottom right of the icon
  */
-void darwinUpdateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage)
+void darwinUpdateDockPreview (QWidget *aMainWindow, VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage)
 {
     CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
@@ -315 +321 @@
                                    kCGRenderingIntentDefault);
     /* Update the dock preview icon */
-    ::darwinUpdateDockPreview (ir, aOverlayImage);
+    ::darwinUpdateDockPreview (aMainWindow, ir, aOverlayImage);
     /* Release the temp data and image */
     CGDataProviderRelease (dp);