Changeset 12096 in vbox

Timestamp:

Sep 4, 2008 2:28:36 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Make the masking correct if in seamless mode & pause state.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxFBQuartz2D.cpp (modified) (4 diffs)

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

@@ -81 +81 @@
 
     bool pause (bool on);
+    bool isPaused() { return mLastState == KMachineState_Paused; }
+    const QPixmap& pauseShot() const { return mPausedShot; }
 
     void setMouseIntegrationEnabled (bool enabled);
@@ -203 +205 @@
     void setPointerShape (MousePointerChangeEvent *me);
 
-    bool isPaused() { return mLastState == KMachineState_Paused; }
     bool isRunning() { return mLastState == KMachineState_Running; }
 

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

@@ -3023 +3023 @@
     }
 
-    /* we have a snapshot for the paused state */
-    QRect r = pe->rect().intersect (viewport()->rect());
-    /* We have to disable paint on screen if we are using the regular painter */
-    bool paintOnScreen = viewport()->testAttribute (Qt::WA_PaintOnScreen);
-    viewport()->setAttribute (Qt::WA_PaintOnScreen, false);
-    QPainter pnt (viewport());
-    pnt.drawPixmap (r.x(), r.y(), mPausedShot,
-                    r.x() + contentsX(), r.y() + contentsY(),
-                    r.width(), r.height());
-    /* Restore the attribute to its previous state */
-    viewport()->setAttribute (Qt::WA_PaintOnScreen, paintOnScreen);
-
+#ifdef VBOX_GUI_USE_QUARTZ2D
+    if (mode == VBoxDefs::Quartz2DMode)
+        mFrameBuf->paintEvent (pe);
+    else
+#endif
+    {
+        /* we have a snapshot for the paused state */
+        QRect r = pe->rect().intersect (viewport()->rect());
+        /* We have to disable paint on screen if we are using the regular painter */
+        bool paintOnScreen = viewport()->testAttribute (Qt::WA_PaintOnScreen);
+        viewport()->setAttribute (Qt::WA_PaintOnScreen, false);
+        QPainter pnt (viewport());
+        pnt.drawPixmap (r.x(), r.y(), mPausedShot,
+                        r.x() + contentsX(), r.y() + contentsY(),
+                        r.width(), r.height());
+        /* Restore the attribute to its previous state */
+        viewport()->setAttribute (Qt::WA_PaintOnScreen, paintOnScreen);
 #ifdef Q_WS_MAC
-    ::darwinUpdateDockPreview (::darwinToCGImageRef (&mPausedShot),
-                               mVirtualBoxLogo,
-                               mMainWnd->dockImageState());
-#endif
+        ::darwinUpdateDockPreview (::darwinToCGImageRef (&mPausedShot),
+                                   mVirtualBoxLogo,
+                                   mMainWnd->dockImageState());
+#endif
+    }
+
 }
 

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

@@ -157 +157 @@
     Assert (mImage);
 
-    QWidget *main = vboxGlobal().mainWindow();
+    VBoxConsoleWnd *main = qobject_cast <VBoxConsoleWnd *> (vboxGlobal().mainWindow());
     Assert (VALID_PTR (main));
     QWidget* viewport = mView->viewport();
@@ -171 +171 @@
     Assert (VALID_PTR (ctx));
     /* We handle the seamless mode as a special case. */
-    if (qobject_cast <VBoxConsoleWnd *> (main)->isTrueSeamless())
+    if (main->isTrueSeamless())
     {
         /* Here we paint the windows without any wallpaper.
@@ -178 +178 @@
         /* Create a subimage of the current view.
          * Currently this subimage is the whole screen. */
-        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        CGImageRef subImage;
+        if (mView->isPaused())
+            subImage = CGImageCreateWithImageInRect (::darwinToCGImageRef (&mView->pauseShot()), CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        else
+            subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
         Assert (VALID_PTR (subImage));
         /* Clear the background (Make the rect fully transparent) */
@@ -221 +225 @@
         QRect ir = aEvent->rect();
         QRect is = QRect (ir.x() + mView->contentsX(), ir.y() + mView->contentsY(), ir.width(), ir.height());
-        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, ::darwinToHIRect (is));
+        CGImageRef subImage;
+        if (mView->isPaused())
+            subImage = CGImageCreateWithImageInRect (::darwinToCGImageRef (&mView->pauseShot()), ::darwinToHIRect (is));
+        else
+            subImage = CGImageCreateWithImageInRect (mImage, ::darwinToHIRect (is));
         Assert (VALID_PTR (subImage));
         /* Ok, for more performance we set a clipping path of the